summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Lake <ilake@google.com>2017-07-13 16:01:17 -0700
committerIan Lake <ilake@google.com>2017-07-13 16:01:17 -0700
commit97cd1f04948f9b91ae1507f9acd6572bdf0917e5 (patch)
tree2d9cac2f4ba77307383ce8cba99e4a911425fb97
parentfe8959fae9b0972cbc15e965f564b0a029430e79 (diff)
downloadandroid_packages_apps_DeskClock-97cd1f04948f9b91ae1507f9acd6572bdf0917e5.tar.gz
android_packages_apps_DeskClock-97cd1f04948f9b91ae1507f9acd6572bdf0917e5.tar.bz2
android_packages_apps_DeskClock-97cd1f04948f9b91ae1507f9acd6572bdf0917e5.zip
Update DeskClock to use v4 NotificationCompat
v7 NotificationCompat's DecoratedCustomViewStyle has been deprecated and folded into the v4 NotificationCompat. By updating the imports, we avoid using the deprecated versions and fully switch to the new versions. Test: mmma packages/apps/DeskClock BUG: 28983951 Change-Id: I9028f3f048fc3857a24fa83f5ed075107d85e7cf
-rw-r--r--src/com/android/deskclock/data/StopwatchNotificationBuilder.java2
-rw-r--r--src/com/android/deskclock/data/TimerNotificationBuilder.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
index 91de2ba24..6e62f06f6 100644
--- a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
+++ b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
@@ -24,10 +24,10 @@ import android.content.res.Resources;
import android.os.SystemClock;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
+import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationCompat.Action;
import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.content.ContextCompat;
-import android.support.v7.app.NotificationCompat;
import android.widget.RemoteViews;
import com.android.deskclock.R;
diff --git a/src/com/android/deskclock/data/TimerNotificationBuilder.java b/src/com/android/deskclock/data/TimerNotificationBuilder.java
index 445485702..2119869ba 100644
--- a/src/com/android/deskclock/data/TimerNotificationBuilder.java
+++ b/src/com/android/deskclock/data/TimerNotificationBuilder.java
@@ -26,8 +26,8 @@ import android.content.res.Resources;
import android.os.Build;
import android.os.SystemClock;
import android.support.annotation.DrawableRes;
+import android.support.v4.app.NotificationCompat;
import android.support.v4.content.ContextCompat;
-import android.support.v7.app.NotificationCompat;
import android.text.TextUtils;
import android.widget.RemoteViews;