diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-02-19 19:09:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-19 19:09:58 +0000 |
commit | 284cf496ed8942ab0c231ce9f45b4fc45b3c7eec (patch) | |
tree | a78de485f00ce028f95887a8d7f6190c84b6111a | |
parent | 26cc6b707c491240eb206bc85580061130e3205b (diff) | |
parent | c22efb1ef63f91f0da3a7c1faba4da2f5772597c (diff) | |
download | Calendar-284cf496ed8942ab0c231ce9f45b4fc45b3c7eec.tar.gz |
Merge "Convert Calendar 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
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | src/com/android/calendar/alerts/DismissAlarmsService.java | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -28,7 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ colorpicker \ android-opt-datetimepicker \ android-opt-timezonepicker \ - android-support-v4 \ + androidx.legacy_legacy-support-v4 \ calendar-common LOCAL_SDK_VERSION := current diff --git a/src/com/android/calendar/alerts/DismissAlarmsService.java b/src/com/android/calendar/alerts/DismissAlarmsService.java index 931f99f4..1ec3c22d 100644 --- a/src/com/android/calendar/alerts/DismissAlarmsService.java +++ b/src/com/android/calendar/alerts/DismissAlarmsService.java @@ -25,7 +25,7 @@ import android.content.Intent; import android.net.Uri; import android.os.IBinder; import android.provider.CalendarContract.CalendarAlerts; -import android.support.v4.app.TaskStackBuilder; +import androidx.core.app.TaskStackBuilder; import android.util.Log; import com.android.calendar.EventInfoActivity; |