Merge "Migrate datetimepicker to androidx."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10

2 files changed, 7 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 4eab7f9..a326fda 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,10 +25,10 @@ android_library {
     resource_dirs: ["res"],
 
     static_libs: [
-        "android-support-annotations",
-        "android-support-compat",
-        "android-support-core-utils",
-        "android-support-core-ui",
+        "androidx.annotation_annotation",
+        "androidx.core_core",
+        "androidx.legacy_legacy-support-core-utils",
+        "androidx.legacy_legacy-support-core-ui",
     ],
 
     optimize: {
diff --git a/src/com/android/datetimepicker/date/MonthView.java b/src/com/android/datetimepicker/date/MonthView.java
index 63d073c..3ed0452 100644
--- a/src/com/android/datetimepicker/date/MonthView.java
+++ b/src/com/android/datetimepicker/date/MonthView.java
@@ -25,9 +25,9 @@ import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.text.format.Time;