summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2018-04-10 10:32:26 -0700
committerAurimas Liutikas <aurimas@google.com>2018-04-10 10:32:26 -0700
commit99b87507e1d6f4589ae70074d3edc3a86f6c404f (patch)
tree329947af5bc63dacb30f1ba7bb559d9b60f3795c
parent956525423e51315015d6902e3b9487e72e9f4885 (diff)
downloadCalendar-99b87507e1d6f4589ae70074d3edc3a86f6c404f.tar.gz
Convert Calendar to androidx
Test: make Calendar Bug: 76692459 Change-Id: I0ee57de3ba43b44799af37efdb6815f88a29eac3
-rw-r--r--Android.mk2
-rw-r--r--src/com/android/calendar/alerts/DismissAlarmsService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 656f3847..4277744d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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;