Merge pull request android#36 from android/update-versions-2

Update the rest of samples to use latest libraries and gradle version.
nurhadif · Mar 6, 2020 · e46bca1 · e46bca1
2 parents 6d73503 + 70ddcae
commit e46bca1
Show file tree

Hide file tree

Showing 51 changed files with 127 additions and 170 deletions.
diff --git a/AlwaysOn/README.md b/AlwaysOn/README.md
@@ -15,7 +15,7 @@ In ambient mode, this app follows best practices by keeping most pixels black, a
 
 In addition and most importantly, the app sleeps while in ambient mode for 20 seconds between any updates to conserving battery life (processor allowed to sleep). If you can hold off on updates for a full minute, you can throw away the Handler and just use onUpdateAmbient to save even more battery life.
 
-As always, you will still want to apply the [performance guidelines][3] outlined in the Watch Faces documention to your app.
+As always, you will still want to apply the [performance guidelines][3] outlined in the Watch Face documentation to your app.
 
 [1]: http://developer.android.com/reference/android/support/wearable/activity/WearableActivity.html
 [2]: https://developer.android.com/training/wearables/watch-faces/designing.html#DesignGuidelines

diff --git a/AlwaysOn/Wearable/build.gradle b/AlwaysOn/Wearable/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -25,12 +25,12 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
 
 
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
 
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
+    compileOnly 'com.google.android.wearable:wearable:2.5.0'
 
-    implementation 'com.google.android.support:wearable:2.4.0'
+    implementation 'com.google.android.support:wearable:2.5.0'
 
 }
 

diff --git a/AlwaysOn/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java b/AlwaysOn/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
@@ -100,13 +100,13 @@ public class MainActivity extends FragmentActivity
     private AmbientModeSupport.AmbientController mAmbientController;
 
     /** If the display is low-bit in ambient mode. i.e. it requires anti-aliased fonts. */
-    boolean mIsLowBitAmbient;
+    private boolean mIsLowBitAmbient;
 
     /**
      * If the display requires burn-in protection in ambient mode, rendered pixels need to be
      * intermittently offset to avoid screen burn-in.
      */
-    boolean mDoBurnInProtection;
+    private boolean mDoBurnInProtection;
 
     private View mContentView;
     private TextView mTimeTextView;
@@ -385,10 +385,8 @@ public void handleMessage(Message message) {
             MainActivity mainActivity = mMainActivityWeakReference.get();
 
             if (mainActivity != null) {
-                switch (message.what) {
-                    case MSG_UPDATE_SCREEN:
-                        mainActivity.refreshDisplayAndSetNextUpdate();
-                        break;
+                if (message.what == MSG_UPDATE_SCREEN) {
+                    mainActivity.refreshDisplayAndSetNextUpdate();
                 }
             }
         }

diff --git a/AlwaysOn/Wearable/src/main/res/layout/activity_main.xml b/AlwaysOn/Wearable/src/main/res/layout/activity_main.xml
@@ -25,7 +25,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="10px"
+    android:padding="10dp"
     tools:context=".MainActivity">
 
     <LinearLayout

diff --git a/AlwaysOn/gradle/wrapper/gradle-wrapper.properties b/AlwaysOn/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 04 13:20:34 PDT 2019
+#Thu Mar 05 13:51:46 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/DataLayer/Application/build.gradle b/DataLayer/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -23,13 +23,13 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
 
 
 
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
 
     wearApp project(':Wearable')

diff --git a/DataLayer/Application/src/main/res/values-v11/template-styles.xml b/DataLayer/Application/src/main/res/values-v11/template-styles.xml
diff --git a/DataLayer/Wearable/build.gradle b/DataLayer/Wearable/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -22,17 +22,17 @@ repositories {
 dependencies {
 
     implementation 'androidx.wear:wear:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
 
 
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
 
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
+    compileOnly 'com.google.android.wearable:wearable:2.5.0'
 
-    implementation 'com.google.android.support:wearable:2.4.0'
+    implementation 'com.google.android.support:wearable:2.5.0'
 
 }
 

diff --git a/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/MainActivity.java b/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
@@ -330,7 +330,6 @@ protected void onPostExecute(Bitmap bitmap) {
                 // Moves RecyclerView to appropriate row to show new image sent over.
                 if (imageAssetItemIndex > -1) {
                     mWearableRecyclerView.scrollToPosition(imageAssetItemIndex);
-                    ;
                 }
             }
         }

diff --git a/DataLayer/gradle/wrapper/gradle-wrapper.properties b/DataLayer/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Mar 05 13:52:01 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/JumpingJack/Wearable/build.gradle b/JumpingJack/Wearable/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/JumpingJack/gradle/wrapper/gradle-wrapper.properties b/JumpingJack/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 04 09:06:56 PST 2020
+#Thu Mar 05 13:52:33 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/RuntimePermissionsWear/Application/build.gradle b/RuntimePermissionsWear/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -18,10 +18,10 @@ repositories {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
 
     implementation project(':Shared')

diff --git a/...tion/src/main/java/com/example/android/wearable/runtimepermissions/MainPhoneActivity.java b/...tion/src/main/java/com/example/android/wearable/runtimepermissions/MainPhoneActivity.java
@@ -203,6 +203,7 @@ public void onComplete(Task<CapabilityInfo> task) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         Log.d(TAG, "onActivityResult()");
         if (requestCode == REQUEST_WEAR_PERMISSION_RATIONALE) {
 

diff --git a/RuntimePermissionsWear/Application/src/main/res/layout/activity_main.xml b/RuntimePermissionsWear/Application/src/main/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity"
+    tools:context=".MainPhoneActivity"
     tools:deviceIds="wear_square"
     android:padding="12dp">
 

diff --git a/RuntimePermissionsWear/Application/src/main/res/values-v11/template-styles.xml b/RuntimePermissionsWear/Application/src/main/res/values-v11/template-styles.xml
diff --git a/RuntimePermissionsWear/Shared/build.gradle b/RuntimePermissionsWear/Shared/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/RuntimePermissionsWear/Wearable/build.gradle b/RuntimePermissionsWear/Wearable/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -20,12 +20,12 @@ repositories {
 dependencies {
     implementation 'androidx.wear:wear:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
 
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
+    compileOnly 'com.google.android.wearable:wearable:2.5.0'
 
-    implementation 'com.google.android.support:wearable:2.4.0'
+    implementation 'com.google.android.support:wearable:2.5.0'
 
     implementation project(':Shared')
 }

diff --git a/...rable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java b/...rable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java
@@ -92,7 +92,7 @@ public class MainWearActivity extends FragmentActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.d(TAG, "onCreate()");
-        super.onCreate(savedInstanceState);;
+        super.onCreate(savedInstanceState);
 
         /*
          * Since this is a remote permission, we initialize it to false and then check the remote

diff --git a/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties b/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Mar 05 13:52:57 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/SpeedTracker/Application/build.gradle b/SpeedTracker/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/SpeedTracker/Shared/build.gradle b/SpeedTracker/Shared/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/SpeedTracker/Wearable/build.gradle b/SpeedTracker/Wearable/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/SpeedTracker/gradle/wrapper/gradle-wrapper.properties b/SpeedTracker/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 04 09:33:44 PST 2020
+#Thu Mar 05 13:53:18 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/WatchFace/Application/build.gradle b/WatchFace/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -23,13 +23,12 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.support:wearable:2.4.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
-
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
-
+    implementation 'com.google.android.support:wearable:2.5.0'
+    compileOnly 'com.google.android.wearable:wearable:2.5.0'
 
     wearApp project(':Wearable')
 

diff --git a/WatchFace/Wearable/build.gradle b/WatchFace/Wearable/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -26,12 +26,10 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
 
 
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 
-
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
-
-    implementation 'com.google.android.support:wearable:2.4.0'
+    implementation 'com.google.android.support:wearable:2.5.0'
+    compileOnly 'com.google.android.wearable:wearable:2.5.0'
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -330,7 +330,6 @@ protected void onPostExecute(Bitmap bitmap) { @@
                     // Moves RecyclerView to appropriate row to show new image sent over.
                     if (imageAssetItemIndex > -1) {
                         mWearableRecyclerView.scrollToPosition(imageAssetItemIndex);
-                        ;
                     }
                 }
             }
@@ Expand Down @@