diff options
author | Aurimas Liutikas <aurimas@google.com> | 2019-02-19 12:16:46 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-19 12:16:46 -0800 |
commit | 820987cfa4832476e4d001816bfce440cf5fbe45 (patch) | |
tree | 59b57aecf2fab34eb19fe5880c98ffecd94ae2a6 | |
parent | 1631236fbcd1e9ed3453a31c9db80ef9b3b920dd (diff) | |
parent | 44de12b6da98fbfbdd83c029c6a79074658c5b3b (diff) | |
download | datetimepicker-820987cfa4832476e4d001816bfce440cf5fbe45.tar.gz |
Merge "Migrate datetimepicker to androidx." am: 715fe1d09d
am: 44de12b6da
Change-Id: I3ffdf7a61cef64bcf486da28ccfe46703e5c3418
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | src/com/android/datetimepicker/date/MonthView.java | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -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; |