WearVerifyRemoteApp: Upgrades to androidx.
Bug: 129548613
Test: Manually tested.
Change-Id: I38f7ef23595ba6c23782867ad35a96399bbacf9b
diff --git a/wearable/wear/WearVerifyRemoteApp/Application/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainMobileActivity.java b/wearable/wear/WearVerifyRemoteApp/Application/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainMobileActivity.java
index e9e9a49..7e81582 100644
--- a/wearable/wear/WearVerifyRemoteApp/Application/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainMobileActivity.java
+++ b/wearable/wear/WearVerifyRemoteApp/Application/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainMobileActivity.java
@@ -20,13 +20,14 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.ResultReceiver;
-import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.wearable.CapabilityClient;
diff --git a/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle b/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle
index 7833099..9723e86 100644
--- a/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle
+++ b/wearable/wear/WearVerifyRemoteApp/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:28.0.0'
+ 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'
diff --git a/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainWearActivity.java b/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainWearActivity.java
index 6521b09..3a6318d 100644
--- a/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainWearActivity.java
+++ b/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/java/com/example/android/wearable/wear/wearverifyremoteapp/MainWearActivity.java
@@ -20,8 +20,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.ResultReceiver;
-import android.support.v4.app.FragmentActivity;
-import android.support.wear.ambient.AmbientModeSupport;
import android.support.wearable.phone.PhoneDeviceType;
import android.support.wearable.view.ConfirmationOverlay;
import android.util.Log;
@@ -29,6 +27,9 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.wear.ambient.AmbientModeSupport;
+
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.wearable.CapabilityClient;
diff --git a/wearable/wear/WearVerifyRemoteApp/gradle.properties b/wearable/wear/WearVerifyRemoteApp/gradle.properties
index 0bc4294..94f8472 100644
--- a/wearable/wear/WearVerifyRemoteApp/gradle.properties
+++ b/wearable/wear/WearVerifyRemoteApp/gradle.properties
@@ -18,3 +18,5 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/wearable/wear/WearVerifyRemoteApp/template-params.xml b/wearable/wear/WearVerifyRemoteApp/template-params.xml
index c1a8420..f5b8273 100644
--- a/wearable/wear/WearVerifyRemoteApp/template-params.xml
+++ b/wearable/wear/WearVerifyRemoteApp/template-params.xml
@@ -30,13 +30,17 @@
<has_handheld_app>true</has_handheld_app>
</wearable>
+
+ <androidX>true</androidX>
+
+ <dependency>androidx.legacy:legacy-support-v4:1.0.0</dependency>
+ <dependency>androidx.legacy:legacy-support-v13:1.0.0</dependency>
+ <dependency>androidx.cardview:cardview:1.0.0</dependency>
+ <dependency>androidx.appcompat:appcompat:1.0.2</dependency>
<dependency>com.google.android.support:wearable:2.4.0</dependency>
-
- <dependency_wearable>com.android.support:wear:28.0.0</dependency_wearable>
-
- <!-- Include additional dependencies here.-->
- <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
+ <dependency_wearable>androidx.wear:wear:1.0.0</dependency_wearable>
+ <dependency_wearable>androidx.legacy:legacy-support-v13:1.0.0</dependency_wearable>
<strings>
<intro>
