Always On: Updates Wear apps for migration to new devrel repo.
Bug: 129548613
Test: Manually tested.
Change-Id: I6a38b30155b50c42184519e9ed6662d837009566
diff --git a/wearable/wear/AlwaysOn/Wearable/build.gradle b/wearable/wear/AlwaysOn/Wearable/build.gradle
index 6faf2d1..40537eb 100644
--- a/wearable/wear/AlwaysOn/Wearable/build.gradle
+++ b/wearable/wear/AlwaysOn/Wearable/build.gradle
@@ -6,7 +6,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.0'
+ classpath 'com.android.tools.build:gradle:3.3.2'
}
}
@@ -21,12 +21,12 @@
dependencies {
- implementation 'com.android.support:wear:27.1.1'
+ implementation 'androidx.wear:wear:1.0.0'
+ implementation 'androidx.legacy:legacy-support-v13:1.0.0'
- implementation 'com.google.android.gms:play-services-wearable:15.0.1'
+ implementation 'com.google.android.gms:play-services-wearable:16.0.1'
- implementation 'com.android.support:support-v13:28.0.0'
compileOnly 'com.google.android.wearable:wearable:2.4.0'
@@ -52,9 +52,9 @@
versionCode 1
versionName "1.0"
- minSdkVersion 23
+ minSdkVersion 24
- targetSdkVersion 26
+ targetSdkVersion 28
multiDexEnabled true
diff --git a/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml b/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml
index c105808..0acb7d3 100644
--- a/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml
@@ -16,8 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.wearable.wear.alwayson">
- <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="22" />
-
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
diff --git a/wearable/wear/AlwaysOn/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java b/wearable/wear/AlwaysOn/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
index ab61c41..a17b570 100644
--- a/wearable/wear/AlwaysOn/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
+++ b/wearable/wear/AlwaysOn/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
@@ -25,12 +25,13 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.support.v4.app.FragmentActivity;
-import android.support.wear.ambient.AmbientModeSupport;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.wear.ambient.AmbientModeSupport;
+
import java.lang.ref.WeakReference;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/wearable/wear/AlwaysOn/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/AlwaysOn/Wearable/src/main/res/layout/activity_main.xml
index 662bbe8..487fe54 100644
--- a/wearable/wear/AlwaysOn/Wearable/src/main/res/layout/activity_main.xml
+++ b/wearable/wear/AlwaysOn/Wearable/src/main/res/layout/activity_main.xml
@@ -19,7 +19,7 @@
which is applied as padding to the inner LinearLayout, doesn't obscure text by moving it off
screen.
-->
-<android.support.wear.widget.BoxInsetLayout
+<androidx.wear.widget.BoxInsetLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -76,4 +76,4 @@
android:text="Hello, draw count!"/>
</LinearLayout>
-</android.support.wear.widget.BoxInsetLayout>
\ No newline at end of file
+</androidx.wear.widget.BoxInsetLayout>
\ No newline at end of file
diff --git a/wearable/wear/AlwaysOn/gradle.properties b/wearable/wear/AlwaysOn/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/wearable/wear/AlwaysOn/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/wearable/wear/AlwaysOn/template-params.xml b/wearable/wear/AlwaysOn/template-params.xml
index b7ad4e7..71afab0 100644
--- a/wearable/wear/AlwaysOn/template-params.xml
+++ b/wearable/wear/AlwaysOn/template-params.xml
@@ -19,11 +19,13 @@
<group>Wearable</group>
<package>com.example.android.wearable.wear.alwayson</package>
- <minSdkVersionWear>23</minSdkVersionWear>
- <targetSdkVersionWear>26</targetSdkVersionWear>
<multiDexEnabled>true</multiDexEnabled>
- <dependency_wearable>com.android.support:wear:27.1.1</dependency_wearable>
+ <androidX>true</androidX>
+
+ <dependency_wearable>androidx.wear:wear:1.0.0</dependency_wearable>
+
+ <dependency_wearable>androidx.legacy:legacy-support-v13:1.0.0</dependency_wearable>
<strings>
<intro>
