From 601687a7411f3a964e14ab935f283c20d1048b5f Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Mon, 20 Oct 2014 16:54:08 -0700
Subject: Eleven: Update app widgets and notification

https://cyanogen.atlassian.net/browse/MUSIC-43

Change-Id: Icfd6f2794683bd0402dfc8f7fa545e696a91bd8f
---
 res/drawable-hdpi/btn_playback_pause.png           | Bin 1114 -> 464 bytes
 res/drawable-hdpi/btn_playback_pause_big.png       | Bin 464 -> 0 bytes
 res/drawable-hdpi/btn_playback_pause_med.png       | Bin 242 -> 0 bytes
 res/drawable-hdpi/btn_playback_pause_small.png     | Bin 201 -> 0 bytes
 res/drawable-hdpi/btn_playback_play_med.png        | Bin 309 -> 0 bytes
 res/drawable-mdpi/btn_playback_pause.png           | Bin 1107 -> 1235 bytes
 res/drawable-mdpi/btn_playback_pause_big.png       | Bin 1235 -> 0 bytes
 res/drawable-mdpi/btn_playback_pause_med.png       | Bin 1219 -> 0 bytes
 res/drawable-mdpi/btn_playback_pause_small.png     | Bin 1216 -> 0 bytes
 res/drawable-mdpi/btn_playback_play_med.png        | Bin 248 -> 0 bytes
 res/drawable-nodpi/app_widget_large.png            | Bin 152610 -> 141287 bytes
 res/drawable-nodpi/app_widget_large_alternate.png  | Bin 81016 -> 84748 bytes
 res/drawable-nodpi/app_widget_small.png            | Bin 36970 -> 46845 bytes
 res/drawable-xhdpi/btn_playback_pause.png          | Bin 1181 -> 1266 bytes
 res/drawable-xhdpi/btn_playback_pause_big.png      | Bin 1266 -> 0 bytes
 res/drawable-xhdpi/btn_playback_pause_med.png      | Bin 1235 -> 0 bytes
 res/drawable-xhdpi/btn_playback_pause_small.png    | Bin 1224 -> 0 bytes
 res/drawable-xhdpi/btn_playback_play_med.png       | Bin 328 -> 0 bytes
 res/drawable-xxhdpi/btn_playback_pause.png         | Bin 0 -> 1283 bytes
 res/drawable-xxhdpi/btn_playback_pause_big.png     | Bin 1283 -> 0 bytes
 res/drawable-xxhdpi/btn_playback_pause_med.png     | Bin 1254 -> 0 bytes
 res/drawable-xxhdpi/btn_playback_pause_small.png   | Bin 1230 -> 0 bytes
 res/drawable-xxhdpi/btn_playback_play_med.png      | Bin 435 -> 0 bytes
 .../notification_template_expanded_base.xml        |  18 ++++++++++++------
 res/layout/activity_player_fragment.xml            |   2 +-
 res/layout/app_widget_large.xml                    |  16 +++++++++-------
 res/layout/app_widget_large_alternate.xml          |  17 +++++++++--------
 res/layout/app_widget_small.xml                    |  13 +++++++------
 res/layout/play_pause_progress_button.xml          |   2 +-
 res/values/colors.xml                              |   5 +++++
 30 files changed, 44 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 res/drawable-hdpi/btn_playback_pause.png
 delete mode 100755 res/drawable-hdpi/btn_playback_pause_big.png
 delete mode 100755 res/drawable-hdpi/btn_playback_pause_med.png
 delete mode 100755 res/drawable-hdpi/btn_playback_pause_small.png
 delete mode 100755 res/drawable-hdpi/btn_playback_play_med.png
 mode change 100644 => 100755 res/drawable-mdpi/btn_playback_pause.png
 delete mode 100755 res/drawable-mdpi/btn_playback_pause_big.png
 delete mode 100755 res/drawable-mdpi/btn_playback_pause_med.png
 delete mode 100755 res/drawable-mdpi/btn_playback_pause_small.png
 delete mode 100755 res/drawable-mdpi/btn_playback_play_med.png
 mode change 100644 => 100755 res/drawable-xhdpi/btn_playback_pause.png
 delete mode 100755 res/drawable-xhdpi/btn_playback_pause_big.png
 delete mode 100755 res/drawable-xhdpi/btn_playback_pause_med.png
 delete mode 100755 res/drawable-xhdpi/btn_playback_pause_small.png
 delete mode 100755 res/drawable-xhdpi/btn_playback_play_med.png
 create mode 100755 res/drawable-xxhdpi/btn_playback_pause.png
 delete mode 100755 res/drawable-xxhdpi/btn_playback_pause_big.png
 delete mode 100755 res/drawable-xxhdpi/btn_playback_pause_med.png
 delete mode 100755 res/drawable-xxhdpi/btn_playback_pause_small.png
 delete mode 100755 res/drawable-xxhdpi/btn_playback_play_med.png

(limited to 'res')

diff --git a/res/drawable-hdpi/btn_playback_pause.png b/res/drawable-hdpi/btn_playback_pause.png
old mode 100644
new mode 100755
index 6b435bb..649d1fb
Binary files a/res/drawable-hdpi/btn_playback_pause.png and b/res/drawable-hdpi/btn_playback_pause.png differ
diff --git a/res/drawable-hdpi/btn_playback_pause_big.png b/res/drawable-hdpi/btn_playback_pause_big.png
deleted file mode 100755
index 649d1fb..0000000
Binary files a/res/drawable-hdpi/btn_playback_pause_big.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_playback_pause_med.png b/res/drawable-hdpi/btn_playback_pause_med.png
deleted file mode 100755
index ad546dd..0000000
Binary files a/res/drawable-hdpi/btn_playback_pause_med.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_playback_pause_small.png b/res/drawable-hdpi/btn_playback_pause_small.png
deleted file mode 100755
index 43e7721..0000000
Binary files a/res/drawable-hdpi/btn_playback_pause_small.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_playback_play_med.png b/res/drawable-hdpi/btn_playback_play_med.png
deleted file mode 100755
index f42ceef..0000000
Binary files a/res/drawable-hdpi/btn_playback_play_med.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_playback_pause.png b/res/drawable-mdpi/btn_playback_pause.png
old mode 100644
new mode 100755
index a5aee6f..7920931
Binary files a/res/drawable-mdpi/btn_playback_pause.png and b/res/drawable-mdpi/btn_playback_pause.png differ
diff --git a/res/drawable-mdpi/btn_playback_pause_big.png b/res/drawable-mdpi/btn_playback_pause_big.png
deleted file mode 100755
index 7920931..0000000
Binary files a/res/drawable-mdpi/btn_playback_pause_big.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_playback_pause_med.png b/res/drawable-mdpi/btn_playback_pause_med.png
deleted file mode 100755
index 4a3c031..0000000
Binary files a/res/drawable-mdpi/btn_playback_pause_med.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_playback_pause_small.png b/res/drawable-mdpi/btn_playback_pause_small.png
deleted file mode 100755
index f8b6c21..0000000
Binary files a/res/drawable-mdpi/btn_playback_pause_small.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_playback_play_med.png b/res/drawable-mdpi/btn_playback_play_med.png
deleted file mode 100755
index 3272def..0000000
Binary files a/res/drawable-mdpi/btn_playback_play_med.png and /dev/null differ
diff --git a/res/drawable-nodpi/app_widget_large.png b/res/drawable-nodpi/app_widget_large.png
index db2c003..21bc085 100644
Binary files a/res/drawable-nodpi/app_widget_large.png and b/res/drawable-nodpi/app_widget_large.png differ
diff --git a/res/drawable-nodpi/app_widget_large_alternate.png b/res/drawable-nodpi/app_widget_large_alternate.png
index ad37031..8aad5a3 100644
Binary files a/res/drawable-nodpi/app_widget_large_alternate.png and b/res/drawable-nodpi/app_widget_large_alternate.png differ
diff --git a/res/drawable-nodpi/app_widget_small.png b/res/drawable-nodpi/app_widget_small.png
index ad3cc11..ad45f05 100644
Binary files a/res/drawable-nodpi/app_widget_small.png and b/res/drawable-nodpi/app_widget_small.png differ
diff --git a/res/drawable-xhdpi/btn_playback_pause.png b/res/drawable-xhdpi/btn_playback_pause.png
old mode 100644
new mode 100755
index 333c1b2..8dd321d
Binary files a/res/drawable-xhdpi/btn_playback_pause.png and b/res/drawable-xhdpi/btn_playback_pause.png differ
diff --git a/res/drawable-xhdpi/btn_playback_pause_big.png b/res/drawable-xhdpi/btn_playback_pause_big.png
deleted file mode 100755
index 8dd321d..0000000
Binary files a/res/drawable-xhdpi/btn_playback_pause_big.png and /dev/null differ
diff --git a/res/drawable-xhdpi/btn_playback_pause_med.png b/res/drawable-xhdpi/btn_playback_pause_med.png
deleted file mode 100755
index 0982863..0000000
Binary files a/res/drawable-xhdpi/btn_playback_pause_med.png and /dev/null differ
diff --git a/res/drawable-xhdpi/btn_playback_pause_small.png b/res/drawable-xhdpi/btn_playback_pause_small.png
deleted file mode 100755
index febec8f..0000000
Binary files a/res/drawable-xhdpi/btn_playback_pause_small.png and /dev/null differ
diff --git a/res/drawable-xhdpi/btn_playback_play_med.png b/res/drawable-xhdpi/btn_playback_play_med.png
deleted file mode 100755
index a0c72d1..0000000
Binary files a/res/drawable-xhdpi/btn_playback_play_med.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause.png b/res/drawable-xxhdpi/btn_playback_pause.png
new file mode 100755
index 0000000..015af14
Binary files /dev/null and b/res/drawable-xxhdpi/btn_playback_pause.png differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause_big.png b/res/drawable-xxhdpi/btn_playback_pause_big.png
deleted file mode 100755
index 015af14..0000000
Binary files a/res/drawable-xxhdpi/btn_playback_pause_big.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause_med.png b/res/drawable-xxhdpi/btn_playback_pause_med.png
deleted file mode 100755
index 518ae7c..0000000
Binary files a/res/drawable-xxhdpi/btn_playback_pause_med.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause_small.png b/res/drawable-xxhdpi/btn_playback_pause_small.png
deleted file mode 100755
index efecc3a..0000000
Binary files a/res/drawable-xxhdpi/btn_playback_pause_small.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/btn_playback_play_med.png b/res/drawable-xxhdpi/btn_playback_play_med.png
deleted file mode 100755
index e7f3265..0000000
Binary files a/res/drawable-xxhdpi/btn_playback_play_med.png and /dev/null differ
diff --git a/res/layout-v16/notification_template_expanded_base.xml b/res/layout-v16/notification_template_expanded_base.xml
index da6b8ea..ba1f807 100644
--- a/res/layout-v16/notification_template_expanded_base.xml
+++ b/res/layout-v16/notification_template_expanded_base.xml
@@ -38,7 +38,6 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_toRightOf="@+id/notification_expanded_base_image"
-        android:divider="?android:listDivider"
         android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
         android:gravity="center_vertical"
         android:orientation="horizontal"
@@ -75,13 +74,14 @@
             android:src="@drawable/btn_playback_next" />
     </LinearLayout>
 
-    <ImageView
+    <LinearLayout
+        android:layout_gravity="fill_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="1dp"
         android:layout_above="@+id/notification_expanded_buttons"
         android:layout_alignParentRight="true"
         android:layout_toRightOf="@+id/notification_expanded_base_image"
-        android:background="?android:dividerHorizontal" />
+        android:background="@color/widget_divider" />
 
     <ImageButton
         android:id="@+id/notification_expanded_base_collapse"
@@ -107,17 +107,23 @@
         <TextView
             android:id="@+id/notification_expanded_base_line_one"
             style="@style/NotificationText"
-            android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title" />
+            android:textStyle="bold"
+            android:textColor="@color/widget_text"
+            android:textSize="@dimen/text_size_large"/>
 
         <TextView
             android:id="@+id/notification_expanded_base_line_two"
             style="@style/NotificationText"
-            android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
+            android:textSize="@dimen/text_size_small"/>
 
         <TextView
             android:id="@+id/notification_expanded_base_line_three"
             style="@style/NotificationText"
-            android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
+            android:textSize="@dimen/text_size_small"/>
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index 961c41f..6a81428 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -48,7 +48,7 @@
                 android:contentDescription="@string/accessibility_play"
                 android:focusable="true"
                 android:scaleType="centerCrop"
-                android:src="@drawable/btn_playback_play_med" />
+                android:src="@drawable/btn_playback_play" />
 
             <ProgressBar
                 android:id="@+id/progressBarBackground"
diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml
index 25f428b..b724363 100644
--- a/res/layout/app_widget_large.xml
+++ b/res/layout/app_widget_large.xml
@@ -43,34 +43,36 @@
         <TextView
             android:id="@+id/app_widget_large_line_one"
             style="@style/NotificationText"
-            android:textColor="@color/white"
+            android:textColor="@color/widget_text"
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/app_widget_large_line_two"
             style="@style/NotificationText"
-            android:textColor="@color/transparent_white"
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
             android:textSize="@dimen/text_size_small" />
 
         <TextView
             android:id="@+id/app_widget_large_line_three"
             style="@style/NotificationText"
-            android:textColor="@color/transparent_white"
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
             android:textSize="@dimen/text_size_small" />
     </LinearLayout>
 
-    <ImageView
-        android:layout_width="0dp"
+    <LinearLayout
         android:layout_gravity="fill_horizontal"
-        android:background="?android:dividerHorizontal" />
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="@color/widget_divider" />
 
     <LinearLayout
         android:id="@+id/app_widget_large_buttons"
         android:layout_width="0dp"
         android:layout_gravity="fill_horizontal"
         android:layout_marginBottom="@dimen/app_widget_bottom_margin"
-        android:divider="?android:listDivider"
         android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
         android:gravity="center_vertical"
         android:orientation="horizontal"
diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml
index 600d987..06abf7a 100644
--- a/res/layout/app_widget_large_alternate.xml
+++ b/res/layout/app_widget_large_alternate.xml
@@ -27,7 +27,6 @@
         android:id="@+id/app_widget_large_alternate_image"
         android:layout_width="@dimen/app_widget_large_alternate_artwork_size"
         android:layout_height="@dimen/app_widget_large_alternate_artwork_size"
-        android:layout_rowSpan="2"
         android:background="@drawable/default_artwork"
         android:scaleType="fitXY" />
 
@@ -41,28 +40,31 @@
         <TextView
             android:id="@+id/app_widget_large_alternate_line_one"
             style="@style/NotificationText"
-            android:textColor="@color/white"
+            android:textColor="@color/widget_text"
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/app_widget_large_alternate_line_two"
             style="@style/NotificationText"
-            android:textColor="@color/transparent_white"
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
             android:textSize="@dimen/text_size_small" />
 
         <TextView
             android:id="@+id/app_widget_large_alternate_line_three"
             style="@style/NotificationText"
-            android:textColor="@color/transparent_white"
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
             android:textSize="@dimen/text_size_small" />
 
     </LinearLayout>
 
-    <ImageView
-        android:layout_width="0dp"
+    <LinearLayout
         android:layout_gravity="fill_horizontal"
-        android:background="?android:dividerHorizontal" />
+        android:layout_height="1dp"
+        android:layout_columnSpan="2"
+        android:background="@color/widget_divider" />
 
     <LinearLayout
         android:id="@+id/app_widget_large_alternate_buttons"
@@ -70,7 +72,6 @@
         android:layout_width="0dp"
         android:layout_gravity="fill_horizontal"
         android:layout_marginBottom="@dimen/app_widget_bottom_margin"
-        android:divider="?android:listDivider"
         android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
         android:gravity="center_vertical"
         android:orientation="horizontal"
diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml
index 3b89c7c..e428067 100644
--- a/res/layout/app_widget_small.xml
+++ b/res/layout/app_widget_small.xml
@@ -81,7 +81,7 @@
         android:layout_gravity="fill_horizontal"
         android:layout_height="1dp"
         android:layout_columnSpan="2"
-        android:background="@color/transparent_white" />
+        android:background="@color/widget_divider" />
 
     <LinearLayout
         android:id="@+id/app_widget_small_info_container"
@@ -100,7 +100,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="none"
             android:singleLine="true"
-            android:textColor="@color/white"
+            android:textColor="@color/widget_text"
             android:textSize="@dimen/text_size_small"
             android:textStyle="bold" />
 
@@ -113,9 +113,9 @@
             android:paddingRight="5dp"
             android:singleLine="true"
             android:text="@string/app_widget_text_separator"
-            android:textColor="@color/transparent_white"
-            android:textSize="@dimen/text_size_small"
-            android:textStyle="bold" />
+            android:fontFamily="sans-serif-light"
+            android:textColor="@color/widget_text"
+            android:textSize="@dimen/text_size_small" />
 
         <TextView
             android:id="@+id/app_widget_small_line_two"
@@ -123,7 +123,8 @@
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:textColor="@color/transparent_white"
+            android:textColor="@color/widget_text"
+            android:fontFamily="sans-serif-light"
             android:textSize="@dimen/text_size_small" />
     </LinearLayout>
 
diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml
index 26db43f..b5fe34c 100644
--- a/res/layout/play_pause_progress_button.xml
+++ b/res/layout/play_pause_progress_button.xml
@@ -18,7 +18,7 @@
         android:contentDescription="@string/accessibility_play"
         android:focusable="true"
         android:scaleType="centerCrop"
-        android:src="@drawable/btn_playback_play_med" />
+        android:src="@drawable/btn_playback_play" />
 
     <ProgressBar
         android:id="@+id/progressBarBackground"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5ec19c6..2bd45d8 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -106,4 +106,9 @@
     <color name="no_results_light">@color/white</color>
 
     <color name="now_playing_divider">#40ffffff</color>
+
+    <!-- App widget colors -->
+    <color name="widget_divider">#569fd7</color>
+    <!-- 80% opacity white -->
+    <color name="widget_text">#ccffffff</color>
 </resources>
-- 
cgit v1.2.3