am 3f9a6a65: am f0ba979f: resolved conflicts for merge of eaac74a3 to ub-deskclock-business

* commit '3f9a6a65414537cb8396d24dedd40e9edbaf29e2':
  Update hourly / accent colors

25 files changed, 33 insertions, 33 deletions

diff --git a/res/drawable-hdpi/ic_overflow.png b/res/drawable-hdpi/ic_overflow.png
deleted file mode 100644
index 498bf1007..000000000
--- a/res/drawable-hdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_overflow.png b/res/drawable-mdpi/ic_overflow.png
deleted file mode 100644
index 115413a0e..000000000
--- a/res/drawable-mdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-hdpi/ic_overflow.png b/res/drawable-sw600dp-hdpi/ic_overflow.png
deleted file mode 100644
index 05d77f5d4..000000000
--- a/res/drawable-sw600dp-hdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-mdpi/ic_overflow.png b/res/drawable-sw600dp-mdpi/ic_overflow.png
deleted file mode 100644
index d6898ed34..000000000
--- a/res/drawable-sw600dp-mdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-xhdpi/ic_overflow.png b/res/drawable-sw600dp-xhdpi/ic_overflow.png
deleted file mode 100644
index 3b693123e..000000000
--- a/res/drawable-sw600dp-xhdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-xxhdpi/ic_overflow.png b/res/drawable-sw600dp-xxhdpi/ic_overflow.png
deleted file mode 100644
index 1a35f3446..000000000
--- a/res/drawable-sw600dp-xxhdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-xxxhdpi/ic_overflow.png b/res/drawable-sw600dp-xxxhdpi/ic_overflow.png
deleted file mode 100644
index a6f6edca6..000000000
--- a/res/drawable-sw600dp-xxxhdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-v19/fastscroll_preview.xml b/res/drawable-v19/fastscroll_preview.xml
index 306f45799..33424f6e4 100644
--- a/res/drawable-v19/fastscroll_preview.xml
+++ b/res/drawable-v19/fastscroll_preview.xml
@@ -20,6 +20,6 @@
     <shape xmlns:android="http://schemas.android.com/apk/res/android"
         android:shape="rectangle">
         <corners android:radius="44dp"/>
-        <solid android:color="@color/hot_pink" />
+        <solid android:color="@color/color_accent" />
     </shape>
 </inset>
diff --git a/res/drawable-v21/fastscroll_preview_left.xml b/res/drawable-v21/fastscroll_preview_left.xml
index a4d7fda03..51e54eac9 100644
--- a/res/drawable-v21/fastscroll_preview_left.xml
+++ b/res/drawable-v21/fastscroll_preview_left.xml
@@ -26,6 +26,6 @@
         <padding
             android:paddingLeft="22dp"
             android:paddingRight="22dp" />
-        <solid android:color="@color/hot_pink" />
+        <solid android:color="@color/color_accent" />
     </shape>
 </inset>
diff --git a/res/drawable-v21/fastscroll_preview_right.xml b/res/drawable-v21/fastscroll_preview_right.xml
index 945a2ee17..c2dff95fc 100644
--- a/res/drawable-v21/fastscroll_preview_right.xml
+++ b/res/drawable-v21/fastscroll_preview_right.xml
@@ -26,6 +26,6 @@
         <padding
             android:paddingLeft="22dp"
             android:paddingRight="22dp" />
-        <solid android:color="@color/hot_pink" />
+        <solid android:color="@color/color_accent" />
     </shape>
 </inset>
diff --git a/res/drawable-v21/floating_action_button.xml b/res/drawable-v21/floating_action_button.xml
index f41b83a5c..792d67d13 100644
--- a/res/drawable-v21/floating_action_button.xml
+++ b/res/drawable-v21/floating_action_button.xml
@@ -19,7 +19,7 @@
         android:color="@color/clock_white">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/hot_pink" />
+            <solid android:color="@color/color_accent" />
         </shape>
     </item>
 </ripple>
diff --git a/res/drawable-xhdpi/ic_overflow.png b/res/drawable-xhdpi/ic_overflow.png
deleted file mode 100644
index 9e1a13b98..000000000
--- a/res/drawable-xhdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_overflow.png b/res/drawable-xxhdpi/ic_overflow.png
deleted file mode 100644
index 75ba2cab4..000000000
--- a/res/drawable-xxhdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_overflow.png b/res/drawable-xxxhdpi/ic_overflow.png
deleted file mode 100644
index 253928235..000000000
--- a/res/drawable-xxxhdpi/ic_overflow.png
+++ /dev/null
diff --git a/res/drawable/bg_circle_pink.xml b/res/drawable/bg_circle_accent.xml
index 0d858da4d..a3c256df4 100644
--- a/res/drawable/bg_circle_pink.xml
+++ b/res/drawable/bg_circle_accent.xml
@@ -17,5 +17,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/hot_pink" />
-</shape>
\ No newline at end of file
+    <solid android:color="@color/color_accent" />
+</shape>
diff --git a/res/drawable/fastscroll_preview.xml b/res/drawable/fastscroll_preview.xml
index a34454ac8..b4165e005 100644
--- a/res/drawable/fastscroll_preview.xml
+++ b/res/drawable/fastscroll_preview.xml
@@ -18,5 +18,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="44dp"/>
-    <solid android:color="@color/hot_pink" />
+    <solid android:color="@color/color_accent" />
 </shape>
diff --git a/res/drawable/fastscroll_thumb.xml b/res/drawable/fastscroll_thumb.xml
index daf5f12d4..d57b07943 100644
--- a/res/drawable/fastscroll_thumb.xml
+++ b/res/drawable/fastscroll_thumb.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <solid android:color="@color/hot_pink" />
+            <solid android:color="@color/color_accent" />
             <size android:width="@dimen/fastscroll_thumb_width"
                 android:height="@dimen/fastscroll_thumb_height" />
         </shape>
@@ -29,4 +29,4 @@
                 android:height="@dimen/fastscroll_thumb_height" />
         </shape>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index 75f5207be..922d34782 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -17,7 +17,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/hot_pink" />
+            <solid android:color="@color/color_accent" />
         </shape>
     </item>
     <item>
@@ -30,4 +30,4 @@
             <item android:drawable="@color/transparent" />
         </selector>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/res/layout-sw600dp-land/alarm_clock.xml b/res/layout-sw600dp-land/alarm_clock.xml
index b92e5d500..1e97c33d6 100644
--- a/res/layout-sw600dp-land/alarm_clock.xml
+++ b/res/layout-sw600dp-land/alarm_clock.xml
@@ -48,7 +48,7 @@
         <ImageButton
             android:id="@+id/menu_button"
             android:contentDescription="@string/button_menu"
-            style="?android:attr/actionOverflowButtonStyle"
+            style="?attr/actionOverflowButtonStyle"
             android:layout_gravity="end|center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/res/layout/alarm_activity.xml b/res/layout/alarm_activity.xml
index 5b109655b..62eb731a4 100644
--- a/res/layout/alarm_activity.xml
+++ b/res/layout/alarm_activity.xml
@@ -77,7 +77,7 @@
             android:id="@+id/snooze"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_circle_pink"
+            android:background="@drawable/bg_circle_accent"
             android:contentDescription="@string/alarm_alert_snooze_text"
             android:src="@drawable/ic_snooze_white_80dp"
             ex:layout_row="2"
diff --git a/res/layout/alarm_clock.xml b/res/layout/alarm_clock.xml
index 0a87ebaa5..3d7610c0d 100644
--- a/res/layout/alarm_clock.xml
+++ b/res/layout/alarm_clock.xml
@@ -69,7 +69,7 @@
         android:layout_marginBottom="@dimen/footer_button_layout_margin" >
         <ImageButton
             android:id="@+id/menu_button"
-            style="?android:attr/actionOverflowButtonStyle"
+            style="?attr/actionOverflowButtonStyle"
             android:layout_gravity="end|center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/clock_fragment.xml b/res/layout/clock_fragment.xml
index 81f235add..b1936c910 100644
--- a/res/layout/clock_fragment.xml
+++ b/res/layout/clock_fragment.xml
@@ -31,7 +31,7 @@
         android:layout_marginBottom="@dimen/footer_button_layout_margin" >
         <ImageButton
             android:id="@+id/menu_button"
-            style="?android:attr/actionOverflowButtonStyle"
+            style="?attr/actionOverflowButtonStyle"
             android:layout_gravity="end|center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 1fe02ef4d..6bef8d157 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -51,7 +51,7 @@
         <item name="android:textColorPrimaryInverse">?attr/colorAccent</item>
 
         <!-- Attributes from support.v7.appcompat -->
-        <item name="colorAccent">@color/hot_pink</item>
+        <item name="colorAccent">@color/color_accent</item>
     </style>
 
     <style name="TimePickerStyle" parent="@android:style/Widget.Material.TimePicker" >
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a87ff1b3a..355a2182e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,16 +36,15 @@
     <color name="blackish_selected">#0cffffff</color>
     <color name="transparent">#00000000</color>
 
-    <color name="hot_pink">#FF4081</color>
+    <color name="color_accent">#DA4336</color>
     <color name="hairline">#28ffffff</color>
     <color name="bright_foreground_light_disabled">#80000000</color>
 
     <color name="clock_white">#ffffff</color>
     <color name="clock_gray">#B3ffffff</color>
 
-    <!-- App icon color as default -->
-    <color name="default_background">#5c6bc0</color>
-    <color name="status_bar">#26000000</color>
+    <color name="default_background">#1A237E</color>
+    <color name="status_bar">#66000000</color>
 
     <color name="time_picker_gray">#212121</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 56e10a8c6..ca4e0cc42 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -22,26 +22,29 @@
         <item name="android:layout_gravity">center_horizontal</item>
     </style>
 
-    <style name="AppCompatTranslucentDecorTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
     <style name="BaseActivityTheme" parent="Theme.AppCompat">
         <item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
 
-        <!-- Attributes from support.v7.appcompat -->
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
-        <item name="colorAccent">@color/hot_pink</item>
+        <item name="colorAccent">@color/color_accent</item>
         <item name="colorPrimaryDark">@color/status_bar</item>
         <item name="colorControlActivated">@color/white</item>
         <item name="colorControlNormal">@color/white</item>
     </style>
 
+    <style name="TranslucentDecorActivityTheme" parent="BaseActivityTheme">
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- Attributes from support.v7.appcompat -->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="AlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">
         <!-- Attributes from support.v7.appcompat -->
-        <item name="colorAccent">@color/hot_pink</item>
+        <item name="colorAccent">@color/color_accent</item>
     </style>
 
     <style name="ControlAccentThemeOverlay">
@@ -131,11 +134,9 @@
     <!-- variants: v21 -->
     <style name="FabStyle" />
 
-    <style name="AlarmAlertFullScreenTheme" parent="AppCompatTranslucentDecorTheme" />
+    <style name="AlarmAlertFullScreenTheme" parent="TranslucentDecorActivityTheme" />
 
-    <style name="TimerAlertFullScreenTheme" parent="AppCompatTranslucentDecorTheme">
-        <item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
-    </style>
+    <style name="TimerAlertFullScreenTheme" parent="TranslucentDecorActivityTheme" />
 
     <style name="ScreensaverActivityTheme" parent="Theme.AppCompat.NoActionBar" />