commit 715fe1d09d9272b31ca72403f9854af2890b2086
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 19 19:09:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 19 19:09:58 2019 +0000
tree af546f4ddcfb9e1a5f5d61e38bb86cfa533bbd4d
parent d74021df6b00ac88c091a26d71e7b39c01a7d44d
parent 8097d4c2836f80b5c7e6980d8a55d62759f801d3

Merge "Migrate datetimepicker to androidx."

Android.bp

diff --git a/Android.bp b/Android.bp
index 4eab7f9..a326fda 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,10 +25,10 @@
     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: {

src/com/android/datetimepicker/date/MonthView.java

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.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;