summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2018-04-09 16:38:25 -0700
committerRaman Tenneti <rtenneti@google.com>2019-02-15 13:04:55 -0800
commit8097d4c2836f80b5c7e6980d8a55d62759f801d3 (patch)
treeaf546f4ddcfb9e1a5f5d61e38bb86cfa533bbd4d
parentd74021df6b00ac88c091a26d71e7b39c01a7d44d (diff)
downloaddatetimepicker-8097d4c2836f80b5c7e6980d8a55d62759f801d3.tar.gz
Migrate datetimepicker to androidx.
Test: make android-opt-datetimepicker Bug: 76692459 Change-Id: Idebb7294c44d7f63557d1690e221f39bacba36d3 Merged-In: Idebb7294c44d7f63557d1690e221f39bacba36d3
-rw-r--r--Android.bp8
-rw-r--r--src/com/android/datetimepicker/date/MonthView.java6
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;