WearDrawers: Updates to androidx.
Bug: 129548613
Test: Manually tested.
Change-Id: I7a917711d0b36049018760a8de9b11111a6d9728
diff --git a/wearable/wear/WearDrawers/Wearable/build.gradle b/wearable/wear/WearDrawers/Wearable/build.gradle
index 6faf2d1..e116096 100644
--- a/wearable/wear/WearDrawers/Wearable/build.gradle
+++ b/wearable/wear/WearDrawers/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'
@@ -54,7 +54,7 @@
minSdkVersion 23
- targetSdkVersion 26
+ targetSdkVersion 28
multiDexEnabled true
diff --git a/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java b/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
index 88d71f5..55ce198 100644
--- a/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
+++ b/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
@@ -23,10 +23,6 @@
import android.graphics.ColorMatrixColorFilter;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.wear.ambient.AmbientModeSupport;
-import android.support.wear.widget.drawer.WearableActionDrawerView;
-import android.support.wear.widget.drawer.WearableNavigationDrawerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -35,6 +31,11 @@
import android.widget.ImageView;
import android.widget.Toast;
+import androidx.fragment.app.FragmentActivity;
+import androidx.wear.ambient.AmbientModeSupport;
+import androidx.wear.widget.drawer.WearableActionDrawerView;
+import androidx.wear.widget.drawer.WearableNavigationDrawerView;
+
import java.util.ArrayList;
/**
diff --git a/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml
index 02b1397..607b059 100644
--- a/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml
+++ b/wearable/wear/WearDrawers/Wearable/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.wear.widget.drawer.WearableDrawerLayout
+<androidx.wear.widget.drawer.WearableDrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -24,7 +24,7 @@
android:background="@color/black"
tools:context="com.example.android.wearable.wear.weardrawers.MainActivity">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -35,20 +35,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
- <android.support.wear.widget.drawer.WearableNavigationDrawerView
+ <androidx.wear.widget.drawer.WearableNavigationDrawerView
android:id="@+id/top_navigation_drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey"
app:navigationStyle="multiPage" />
- <android.support.wear.widget.drawer.WearableActionDrawerView
+ <androidx.wear.widget.drawer.WearableActionDrawerView
android:id="@+id/bottom_action_drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey"
app:actionMenu="@menu/action_drawer_menu" />
-</android.support.wear.widget.drawer.WearableDrawerLayout>
\ No newline at end of file
+</androidx.wear.widget.drawer.WearableDrawerLayout>
\ No newline at end of file
diff --git a/wearable/wear/WearDrawers/gradle.properties b/wearable/wear/WearDrawers/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/wearable/wear/WearDrawers/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/wearable/wear/WearDrawers/template-params.xml b/wearable/wear/WearDrawers/template-params.xml
index 190f780..8884098 100644
--- a/wearable/wear/WearDrawers/template-params.xml
+++ b/wearable/wear/WearDrawers/template-params.xml
@@ -21,11 +21,15 @@
<package>com.example.android.wearable.wear.weardrawers</package>
<minSdkVersionWear>23</minSdkVersionWear>
- <targetSdkVersionWear>26</targetSdkVersionWear>
+ <targetSdkVersionWear>28</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>
