1/2: Updates remaining wear samples to new Ambient methods.

Bug: 67751763
Test: Manually tested all wear samples changed.
Change-Id: Iaca8647ff1f40fd7772adc0030b72e796c4b3516

3 files changed, 78 insertions, 54 deletions

diff --git a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle
index 52e76e20..a7cfb714 100644
--- a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle
+++ b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle
@@ -29,13 +29,13 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-        compileSdkVersion 25
+        compileSdkVersion 26
 
-    buildToolsVersion "25.0.3"
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 25
+        targetSdkVersion 26
     }
 
     compileOptions {
diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java
index 774715f2..95a152b2 100644
--- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java
+++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java
@@ -17,6 +17,7 @@
 package com.example.android.wearable.runtimepermissions;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.Sensor;
@@ -25,7 +26,7 @@ import android.os.Bundle;
 import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
-import android.support.wearable.activity.WearableActivity;
+import android.support.wear.ambient.AmbientMode;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -58,7 +59,8 @@ import java.util.concurrent.TimeUnit;
  * this Activity also sends back the results of the permission request to the phone device (and
  * the sensor data if approved).
  */
-public class MainWearActivity extends WearableActivity implements
+public class MainWearActivity extends Activity implements
+        AmbientMode.AmbientCallbackProvider,
         GoogleApiClient.ConnectionCallbacks,
         GoogleApiClient.OnConnectionFailedListener,
         CapabilityApi.CapabilityListener,
@@ -76,6 +78,12 @@ public class MainWearActivity extends WearableActivity implements
     public static final String EXTRA_PROMPT_PERMISSION_FROM_PHONE =
             "com.example.android.wearable.runtimepermissions.extra.PROMPT_PERMISSION_FROM_PHONE";
 
+    /**
+     * Ambient mode controller attached to this display. Used by the Activity to see if it is in
+     * ambient mode.
+     */
+    private AmbientMode.AmbientController mAmbientController;
+
     private boolean mWearBodySensorsPermissionApproved;
     private boolean mPhoneStoragePermissionApproved;
 
@@ -101,7 +109,9 @@ public class MainWearActivity extends WearableActivity implements
         mPhoneStoragePermissionApproved = false;
 
         setContentView(R.layout.activity_main);
-        setAmbientEnabled();
+
+        // Enables Ambient mode.
+        mAmbientController = AmbientMode.attachAmbientSupport(this);
 
         // Checks if phone app requested wear permission (permission request opens later if true).
         mPhoneRequestingWearSensorPermission =
@@ -208,49 +218,6 @@ public class MainWearActivity extends WearableActivity implements
         }
     }
 
-    @Override
-    public void onEnterAmbient(Bundle ambientDetails) {
-        Log.d(TAG, "onEnterAmbient() " + ambientDetails);
-
-        if (mWearBodySensorsPermissionApproved) {
-            mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_approved_bw, 0, 0, 0);
-        } else {
-            mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_denied_bw, 0, 0, 0);
-        }
-
-        if (mPhoneStoragePermissionApproved) {
-            mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_approved_bw, 0, 0, 0);
-        } else {
-            mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_denied_bw, 0, 0, 0);
-        }
-        super.onEnterAmbient(ambientDetails);
-    }
-
-    @Override
-    public void onExitAmbient() {
-        Log.d(TAG, "onExitAmbient()");
-
-        if (mWearBodySensorsPermissionApproved) {
-            mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_approved, 0, 0, 0);
-        } else {
-            mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_denied, 0, 0, 0);
-        }
-
-        if (mPhoneStoragePermissionApproved) {
-            mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_approved, 0, 0, 0);
-        } else {
-            mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
-                    R.drawable.ic_permission_denied, 0, 0, 0);
-        }
-        super.onExitAmbient();
-    }
 
     @Override
     public void onConnected(Bundle bundle) {
@@ -495,7 +462,7 @@ public class MainWearActivity extends WearableActivity implements
 
                 if (mPhoneStoragePermissionApproved) {
 
-                    if (isAmbient()) {
+                    if (mAmbientController.isAmbient()) {
                         mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
                                 R.drawable.ic_permission_approved_bw, 0, 0, 0);
                     } else {
@@ -505,7 +472,7 @@ public class MainWearActivity extends WearableActivity implements
 
                 } else {
 
-                    if (isAmbient()) {
+                    if (mAmbientController.isAmbient()) {
                         mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
                                 R.drawable.ic_permission_denied_bw, 0, 0, 0);
                     } else {
@@ -517,6 +484,63 @@ public class MainWearActivity extends WearableActivity implements
         });
     }
 
+    @Override
+    public AmbientMode.AmbientCallback getAmbientCallback() {
+        return new MyAmbientCallback();
+    }
+
+    private class MyAmbientCallback extends AmbientMode.AmbientCallback {
+        /** Prepares the UI for ambient mode. */
+        @Override
+        public void onEnterAmbient(Bundle ambientDetails) {
+            super.onEnterAmbient(ambientDetails);
+
+            Log.d(TAG, "onEnterAmbient() " + ambientDetails);
+
+            if (mWearBodySensorsPermissionApproved) {
+                mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_approved_bw, 0, 0, 0);
+            } else {
+                mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_denied_bw, 0, 0, 0);
+            }
+
+            if (mPhoneStoragePermissionApproved) {
+                mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_approved_bw, 0, 0, 0);
+            } else {
+                mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_denied_bw, 0, 0, 0);
+            }
+        }
+
+        /** Restores the UI to active (non-ambient) mode. */
+        @Override
+        public void onExitAmbient() {
+            super.onExitAmbient();
+
+            Log.d(TAG, "onExitAmbient()");
+
+            if (mWearBodySensorsPermissionApproved) {
+                mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_approved, 0, 0, 0);
+            } else {
+                mWearBodySensorsPermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_denied, 0, 0, 0);
+            }
+
+            if (mPhoneStoragePermissionApproved) {
+                mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_approved, 0, 0, 0);
+            } else {
+                mPhoneStoragePermissionButton.setCompoundDrawablesWithIntrinsicBounds(
+                        R.drawable.ic_permission_denied, 0, 0, 0);
+            }
+
+        }
+    }
+
+
     /*
      * Handles all messages for the UI coming on and off the main thread. Not all callbacks happen
      * on the main thread.
diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml
index 73e075a6..8562443a 100644
--- a/wearable/wear/RuntimePermissionsWear/template-params.xml
+++ b/wearable/wear/RuntimePermissionsWear/template-params.xml
@@ -32,10 +32,10 @@
         <has_handheld_app>true</has_handheld_app>
     </wearable>
 
-    <dependency>com.android.support:appcompat-v7:25.3.1</dependency>
-    <dependency>com.android.support:design:25.3.1</dependency>
+    <dependency>com.android.support:appcompat-v7:27.0.0</dependency>
+    <dependency>com.android.support:design:27.0.0</dependency>
 
-    <dependency_wearable>com.android.support:wear:26.0.0</dependency_wearable>
+    <dependency_wearable>com.android.support:wear:27.0.0</dependency_wearable>
 
     <strings>
         <intro>