release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-4185249 snap-temp-L63000000082739046

Change-Id: Id20c740fefed5861fd2a569583be52bf50c95d94

4 files changed, 6 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index e4fa27366..bee91034c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
         android-support-design \
         android-support-percent \
         android-support-transition \
-        android-support-v4 \
+        android-support-compat \
+        android-support-media-compat \
         android-support-v13 \
         android-support-v14-preference \
         android-support-v7-appcompat \
diff --git a/res/layout/chronometer_notif_content.xml b/res/layout/chronometer_notif_content.xml
index c962a0e11..e460f4442 100644
--- a/res/layout/chronometer_notif_content.xml
+++ b/res/layout/chronometer_notif_content.xml
@@ -26,13 +26,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Notification.Title" />
+        android:textAppearance="@style/TextAppearance.Compat.Notification.Title" />
 
     <TextView
         android:id="@+id/state"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Notification" />
+        android:textAppearance="@style/TextAppearance.Compat.Notification" />
 
 </LinearLayout>
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;