Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0

21 files changed, 54 insertions, 28 deletions

diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk
index ae3e8d1..e049098 100644
--- a/data/sounds/AllAudio.mk
+++ b/data/sounds/AllAudio.mk
@@ -326,6 +326,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
     $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \
     $(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
+    $(LOCAL_PATH)/effects/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
     $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
     $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
     $(LOCAL_PATH)/notifications/material/ogg/Ariel.ogg:system/media/audio/notifications/Ariel.ogg \
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 6c85a8f..afb98be 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -32,7 +32,7 @@
         android:layout_gravity="bottom|center_horizontal"
         android:gravity="center_horizontal"
         android:textStyle="italic"
-        android:textColor="#ffffff"
+        android:textColor="@color/keyguard_indication_text_color"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:accessibilityLiveRegion="polite" />
 
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index 8d33742..6cca05f 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -58,7 +58,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/header_battery_margin_keyguard"
             android:paddingEnd="@dimen/battery_level_padding_end"
-            android:textColor="#ffffff"
+            android:textColor="@color/status_bar_battery_level_text_color"
             android:visibility="gone"
             android:textSize="@dimen/battery_level_text_size"
             android:importantForAccessibility="noHideDescendants"/>
@@ -73,7 +73,7 @@
         android:gravity="center_vertical"
         android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="#ffffff"
+        android:textColor="@color/keyguard_carrier_text_color"
         android:singleLine="true" />
 
 </com.android.systemui.statusbar.phone.KeyguardStatusBarView>
diff --git a/packages/SystemUI/res/layout/lockscreen_shortcuts.xml b/packages/SystemUI/res/layout/lockscreen_shortcuts.xml
index 1c99d96..fec5e83 100644
--- a/packages/SystemUI/res/layout/lockscreen_shortcuts.xml
+++ b/packages/SystemUI/res/layout/lockscreen_shortcuts.xml
@@ -15,7 +15,7 @@
 
     <TextView
         android:textSize="15sp"
-        android:textColor="#424242"
+        android:textColor="@color/lockscreen_message_text_color"
         android:gravity="center"
         android:layout_below="@id/phone_button"
         android:layout_alignStart="@id/phone_button"
@@ -45,7 +45,7 @@
             android:layout_height="@dimen/keyguard_affordance_height" />
         <ImageView
             android:id="@+id/middle_button"
-            android:tint="#666666"
+            android:tint="@color/lockscreen_middle_button_tint_color"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true"
             android:scaleType="center"
diff --git a/packages/SystemUI/res/layout/mland.xml b/packages/SystemUI/res/layout/mland.xml
index d1b6d00..5ec0f7f 100644
--- a/packages/SystemUI/res/layout/mland.xml
+++ b/packages/SystemUI/res/layout/mland.xml
@@ -48,7 +48,7 @@
                 android:layout_height="48dp"
                 android:scaleType="fitCenter"
                 android:layout_gravity="center"
-                android:tint="#000000"
+                android:tint="@color/play_button_image_tint_color"
                 android:src="@drawable/play"
                 />
             <TextView
@@ -58,7 +58,7 @@
                 android:layout_gravity="center"
                 android:alpha="0"
                 android:textSize="40dp"
-                android:textColor="#000000"
+                android:textColor="@color/play_button_text_color"
                 />
         </FrameLayout>
     </FrameLayout>
diff --git a/packages/SystemUI/res/layout/mland_scorefield.xml b/packages/SystemUI/res/layout/mland_scorefield.xml
index 0ed72e4..31e4b4b 100644
--- a/packages/SystemUI/res/layout/mland_scorefield.xml
+++ b/packages/SystemUI/res/layout/mland_scorefield.xml
@@ -22,7 +22,7 @@
         android:textStyle="bold"
         android:textSize="22sp"
         android:gravity="center"
-        android:textColor="#FFAAAAAA"
+        android:textColor="@color/mland_scorefield_text_color"
         android:paddingStart="12dp"
         android:paddingEnd="12dp"
         android:paddingTop="4dp"
diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml
index 9df4425..2807bb0 100644
--- a/packages/SystemUI/res/layout/qs_panel.xml
+++ b/packages/SystemUI/res/layout/qs_panel.xml
@@ -24,7 +24,7 @@
 
     <com.android.systemui.qs.QSDragPanel
             android:id="@+id/quick_settings_panel"
-            android:background="#0000"
+            android:background="@color/quick_settings_panel_background"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 </com.android.systemui.qs.QSContainer>
diff --git a/packages/SystemUI/res/layout/recents_empty.xml b/packages/SystemUI/res/layout/recents_empty.xml
index 4b68e77..bd3e3bc 100644
--- a/packages/SystemUI/res/layout/recents_empty.xml
+++ b/packages/SystemUI/res/layout/recents_empty.xml
@@ -21,8 +21,8 @@
     android:layout_gravity="center"
     android:gravity="center"
     android:textSize="16sp"
-    android:textColor="#ffffffff"
+    android:textColor="@color/recents_empty_message_text_color"
     android:text="@string/recents_empty_message"
     android:fontFamily="sans-serif"
-    android:background="#80000000"
-    android:visibility="gone" />
\ No newline at end of file
+    android:background="@color/recents_empty_background_color"
+    android:visibility="gone" />
diff --git a/packages/SystemUI/res/layout/recents_search_bar.xml b/packages/SystemUI/res/layout/recents_search_bar.xml
index 915283e..f9bd02c 100644
--- a/packages/SystemUI/res/layout/recents_search_bar.xml
+++ b/packages/SystemUI/res/layout/recents_search_bar.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/recents_search_bar_label"
-        android:textColor="#99ffffff"
+        android:textColor="@color/recents_search_bar_label_text_color"
         android:textSize="18sp"
         android:textAllCaps="true" />
 </FrameLayout>
diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml
index 477d9d7..423ecb8 100644
--- a/packages/SystemUI/res/layout/recents_task_view_header.xml
+++ b/packages/SystemUI/res/layout/recents_task_view_header.xml
@@ -36,7 +36,7 @@
         android:layout_marginStart="64dp"
         android:layout_marginEnd="64dp"
         android:textSize="16sp"
-        android:textColor="#ffffffff"
+        android:textColor="@color/task_view_header_text_color"
         android:text="@string/recents_empty_message"
         android:fontFamily="sans-serif-medium"
         android:singleLine="true"
@@ -63,4 +63,4 @@
         android:background="@drawable/recents_button_bg"
         android:visibility="invisible"
         android:src="@drawable/recents_dismiss_light" />
-</com.android.systemui.recents.views.TaskViewHeader>
\ No newline at end of file
+</com.android.systemui.recents.views.TaskViewHeader>
diff --git a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
index 9900b84..6d24b0c 100644
--- a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
+++ b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
@@ -59,7 +59,7 @@
         android:paddingEnd="8dp"
         android:paddingStart="8dp"
         android:text="@string/screen_pinning_positive"
-        android:textColor="@android:color/white"
+        android:textColor="@color/screen_pinning_description_text_color"
         android:textSize="14sp" />
 
     <Button
@@ -74,7 +74,7 @@
         android:paddingEnd="8dp"
         android:paddingStart="8dp"
         android:text="@string/screen_pinning_negative"
-        android:textColor="@android:color/white"
+        android:textColor="@color/screen_pinning_cancel_button_text_color"
         android:textSize="14sp" />
 
 </RelativeLayout>
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index 291dc65..3bedf3f 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -100,7 +100,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/header_battery_margin_keyguard"
-                android:textColor="#ffffff"
+                android:textColor="@color/status_bar_battery_level_text_color"
                 android:textSize="@dimen/battery_level_text_size" />
 
             <com.android.systemui.statusbar.policy.Clock
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
index 577ad55..5effca4 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
@@ -115,7 +115,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/clock_collapsed_bottom_margin"
-        android:background="@drawable/ripple_drawable"
         android:layout_alignParentBottom="true">
         <com.android.systemui.statusbar.policy.DateView android:id="@+id/date_collapsed"
             android:layout_width="wrap_content"
@@ -123,6 +122,7 @@
             android:layout_marginStart="16dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
+            android:background="@drawable/ripple_drawable"
             android:layout_below="@id/clock"
             systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm"
             />
@@ -133,6 +133,7 @@
             android:layout_marginStart="16dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
+            android:background="@drawable/ripple_drawable"
             android:layout_below="@id/clock"
             systemui:datePattern="eeeeMMMMd"
             />
@@ -229,7 +230,7 @@
         android:fontFamily="sans-serif-condensed"
         android:textSize="11dp"
         android:textStyle="bold"
-        android:textColor="#00A040"
+        android:textColor="@color/header_debug_info_text_color"
         android:padding="2dp"
         />
 
diff --git a/packages/SystemUI/res/layout/status_bar_no_notifications.xml b/packages/SystemUI/res/layout/status_bar_no_notifications.xml
index dd501d4..f4d1f1b 100644
--- a/packages/SystemUI/res/layout/status_bar_no_notifications.xml
+++ b/packages/SystemUI/res/layout/status_bar_no_notifications.xml
@@ -27,7 +27,7 @@
             android:layout_height="64dp"
             android:paddingTop="12dp"
             android:gravity="top|center_horizontal"
-            android:textColor="#ffffff"
+            android:textColor="@color/no_notifications_text_color"
             android:textSize="20sp"
             android:text="@string/empty_shade_text"/>
 </com.android.systemui.statusbar.EmptyShadeView>
diff --git a/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml b/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml
index 1675773..be18569 100644
--- a/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml
+++ b/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="20dp"
-        android:textColor="@android:color/holo_blue_light"
+        android:textColor="@color/no_recent_apps_text_color"
         android:text="@string/status_bar_no_recent_apps"
         android:gravity="center_horizontal"
         android:layout_gravity="center"
diff --git a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml
index f699fce..bc8086d 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml
@@ -44,7 +44,7 @@
             android:layout_gravity="center_vertical"
             android:background="@drawable/keyguard_overflow_number_background"
             android:gravity="center"
-            android:textColor="#ff686868"
+            android:textColor="@color/keyguard_overflow_number_text_color"
             android:textStyle="bold"
             android:textSize="14dp"
             />
diff --git a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml
index e220a16..d99a9f6 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml
@@ -25,6 +25,6 @@
         android:id="@+id/speedbump_line"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="#6fdddddd"
+        android:background="@color/speedbump_line_divider"
         android:layout_gravity="center_vertical"/>
 </com.android.systemui.statusbar.SpeedBumpView>
diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
index 062e6cb..d28b870 100644
--- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
+++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
@@ -55,7 +55,7 @@
         android:layout_centerVertical="true"
         android:gravity="center"
         android:paddingTop="26dp"
-        android:textColor="#666666"
+        android:textColor="@color/toggle_slider_text_color"
         android:textSize="12sp"
         android:visibility="gone"
         />
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index 43ab4bb..1f88ef3 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -53,7 +53,7 @@
             android:contentDescription="@string/accessibility_desc_close"
             android:scaleType="center"
             android:src="@drawable/ic_close"
-            android:tint="@android:color/white" />
+            android:tint="@color/zen_ic_close_tint_color" />
 
         <TextView
             android:id="@+id/zen_introduction_message"
diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml
index 93326a7..5578741 100644
--- a/packages/SystemUI/res/values/cm_colors.xml
+++ b/packages/SystemUI/res/values/cm_colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The CyanogenMod Project
+     Copyright (C) 2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -73,4 +73,28 @@
     <color name="qs_title_text_color">#80cbc4</color>
     <color name="qs_edit_header_instruction_text_color">@android:color/white</color>
     <color name="qs_row_text_color">@android:color/white</color>
+
+    <!-- More exposed hard coded colors -->
+    <color name="toggle_slider_text_color">#666666</color>
+    <color name="no_recent_apps_text_color">@android:color/holo_blue_light</color>
+    <color name="no_notifications_text_color">#ffffff</color>
+    <color name="keyguard_overflow_number_text_color">#ff686868</color>
+    <color name="keyguard_carrier_text_color">#ffffff</color>
+    <color name="screen_pinning_description_text_color">@android:color/white</color>
+    <color name="screen_pinning_cancel_button_text_color">@android:color/white</color>
+    <color name="recents_empty_message_text_color">#ffffffff</color>
+    <color name="task_view_header_text_color">#ffffffff</color>
+    <color name="recents_search_bar_label_text_color">#99ffffff</color>
+    <color name="recents_empty_background_color">#80000000</color>
+    <color name="qs_tile_edit_header_instruction_text_color">@android:color/white</color>
+    <color name="mland_scorefield_text_color">#FFAAAAAA</color>
+    <color name="keyguard_indication_text_color">#ffffff</color>
+    <color name="speedbump_line_divider">#6fdddddd</color>
+    <color name="quick_settings_panel_background">#0000</color>
+    <color name="lockscreen_message_text_color">#424242</color>
+    <color name="lockscreen_middle_button_tint_color">#666666</color>
+    <color name="play_button_image_tint_color">#000000</color>
+    <color name="play_button_text_color">#000000</color>
+    <color name="zen_ic_close_tint_color">@android:color/white</color>
+    <color name="header_debug_info_text_color">#00A040</color>
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index 3337714..07ec843 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -511,7 +511,7 @@ public class ZenModePanel extends LinearLayout {
         GregorianCalendar weekRange = new GregorianCalendar();
         final long now = weekRange.getTimeInMillis();
         setToMidnight(weekRange);
-        weekRange.roll(Calendar.DATE, 6);
+        weekRange.add(Calendar.DATE, 6);
         final long nextAlarmMs = mController.getNextAlarm();
         if (nextAlarmMs > 0) {
             GregorianCalendar nextAlarm = new GregorianCalendar();