Update iconography.

Change main icon from holoyolo to material. Switch to mipmap ref.
Remove LargeIcon from notification as it clashes with the new
icon. Update iconography in the chooser for App Themer and Store.

Change-Id: I5b4d5c7eb8ee617caf0dd352540d44d29d5345f1
Ticket: DES-365

18 files changed, 71 insertions, 13 deletions

diff --git a/res/drawable-hdpi/ic_quickthemes.png b/res/drawable-hdpi/ic_quickthemes.png
deleted file mode 100644
index eaabb60..0000000
--- a/res/drawable-hdpi/ic_quickthemes.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_quickthemes_qstile.png b/res/drawable-hdpi/ic_quickthemes_qstile.png
deleted file mode 100644
index a5404d8..0000000
--- a/res/drawable-hdpi/ic_quickthemes_qstile.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_quickthemes.png b/res/drawable-mdpi/ic_quickthemes.png
deleted file mode 100644
index bfb3a64..0000000
--- a/res/drawable-mdpi/ic_quickthemes.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_quickthemes_qstile.png b/res/drawable-mdpi/ic_quickthemes_qstile.png
deleted file mode 100644
index c7297ce..0000000
--- a/res/drawable-mdpi/ic_quickthemes_qstile.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_quickthemes.png b/res/drawable-xhdpi/ic_quickthemes.png
deleted file mode 100644
index bbb2441..0000000
--- a/res/drawable-xhdpi/ic_quickthemes.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_quickthemes_qstile.png b/res/drawable-xhdpi/ic_quickthemes_qstile.png
deleted file mode 100644
index cf8dc52..0000000
--- a/res/drawable-xhdpi/ic_quickthemes_qstile.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_quickthemes.png b/res/drawable-xxhdpi/ic_quickthemes.png
deleted file mode 100644
index fdb1427..0000000
--- a/res/drawable-xxhdpi/ic_quickthemes.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_quickthemes_qstile.png b/res/drawable-xxhdpi/ic_quickthemes_qstile.png
deleted file mode 100644
index f44c87c..0000000
--- a/res/drawable-xxhdpi/ic_quickthemes_qstile.png
+++ /dev/null
diff --git a/res/drawable/ic_appthemer.xml b/res/drawable/ic_appthemer.xml
new file mode 100644
index 0000000..f75cb8e
--- /dev/null
+++ b/res/drawable/ic_appthemer.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2015 Cyanogen, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="@color/bottom_row_icon_color"
+        android:pathData="M24,48C10.7,48,0,37.3,0,24S10.7,0,24,0s24,10.7,24,24S37.3,48,24,48z
+M12,37.1c0,0,1,1.9,4,1.9s7.9-2,11-2 c2,0,3.9,1,6,1s3-1,3-1v-5H12V37.1z
+M37,27c0-2.7-2.4-4-4-4c-1.6,0,0.3,0-2,0s-3.7-0.7-3.7-2.4c0-1.7,1.7-8.1,1.7-10.6s-1.9-5-5-5
+s-5,2.5-5,5s1.7,8.8,1.7,10.6c0,1.7-1.4,2.4-3.7,2.4s-0.4,0-2,0s-4,1.3-4,4s0,3,0,3h26C37,30,37,29.7,37,27z
+M24,7.7
+c1.2,0,2.2,1,2.2,2.2c0,1.3-0.9,2.2-2.2,2.2s-2.2-1-2.2-2.2C21.8,8.7,22.8,7.7,24,7.7z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_qs_appthemer.xml b/res/drawable/ic_qs_appthemer.xml
new file mode 100644
index 0000000..5e2729c
--- /dev/null
+++ b/res/drawable/ic_qs_appthemer.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2015 Cyanogen, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="@color/per_app_theme_qs_icon_color"
+        android:pathData="M5.5,35.5c0,0,0-0.7,0-4.3s2.8-5.7,5-5.7c2.2,0,0.9,0,4,0c3.1,0,4.4-1.4,4.4-3.7c0-2.3-1.4-11-1.4-14.3
+s1.7-6,6-6s6,2.7,6,6s-1.4,12-1.4,14.3c0,2.3,1.3,3.7,4.4,3.7s1.8,0,4,0s5,2.1,5,5.7s0,4.3,0,4.3H5.5z
+M23.5,4.5c-1.7,0-3,1.3-3,3 s1.3,3,3,3s3-1.3,3-3S25.2,4.5,23.5,4.5z
+M40.5,44.5c0,0-5.7-1-10-1c-4.3,0-13.9,2-18,2s-6-2-6-2v-6h34V44.5z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_themestore.xml b/res/drawable/ic_themestore.xml
index 1626ef8..ab48486 100644
--- a/res/drawable/ic_themestore.xml
+++ b/res/drawable/ic_themestore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015 The CyanogenMod Project
+    Copyright (c) 2015 Cyanogen, Inc.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,15 +21,10 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M42.8,12.5v28c0,0.9,0.5,5-19,5c-19,0-19-3.4-19-4v-29c-2.6-1.6-3.9-2.9-4-3l2-3h2
-v-2c0.2-0.1,2.9-2,19-2c15.6,0,19,2,19,2v2h2l2,3C46.6,9.6,45.4,10.9,42.8,12.5z
-M6.8,40.5c0,0.5-0.1,2.3,17,2.3
-c17.4,0,17-2.1,17-2.3v-22c-0.6-0.4-1-1.6-1-2.3v-2c-1.4,0.7-2.2,0.9-4,1.5v0.6c0,0.1,0,0.1,0,0.2c0,0,0,0,0,0V17v1.5V19
-c0,1.4-1.1,2.5-2.5,2.5s-2.5-1.1-2.5-2.5v-2c0-0.1,0-0.1,0-0.2c-1.5,0.3-3.4,0.6-5,0.7V19v2.5V22c0,1.4-1.1,2.5-2.5,2.5
-s-2.5-1.1-2.5-2.5v-0.5V19v-0.5c-1.7-0.1-2.5-0.7-4-1V24v4.5V30c0,1.4-1.1,2.5-2.5,2.5s-2.5-1.1-2.5-2.5v-1.2V24v-7.5
-c-1.7-0.6-1.7-0.3-3-1c0,1.3,0,3,0,3c0,0.8-1.4,1.6-2,2V40.5z
-M42.9,8.8L42.9,8.8c0,0-5.9,2-12.2,3c0-0.1,0-0.2,0-0.3v-3
-c0-1.1-1.1-2-2.5-2s-2.5,0.9-2.5,2v3c0,0.3,0.1,0.6,0.3,0.9c-0.8,0.1-1.5,0.1-2.3,0.1c-1,0-2.1-0.1-3.2-0.2c0.1-0.3,0.2-0.5,0.2-0.8
-v-1c0-1.1-0.9-2-2-2s-2,0.9-2,2v1c0,0.1,0,0.2,0,0.3c-6.3-1.2-12-3.3-12-3.3s5.6,6,19,6C38.4,14.5,42.4,9.7,42.9,8.8L42.9,8.8z" />
+        android:fillColor="@color/bottom_row_icon_color"
+        android:pathData="M24,48C10.7,48,0,37.3,0,24S10.7,0,24,0s24,10.7,24,24S37.3,48,24,48z
+M38,14h-1v-3h-3v9c0,0.8-0.7,1.1-1.5,1.1
+c-0.8,0-1.5-0.3-1.5-1.1v-9h-3v14c0,1.1-0.2,2-1,2c-0.3,0-0.6,0-1,0c-0.5-0.4-1-0.9-1-2V15h-3v7c0,0.8-0.1,2-0.8,2
+c-0.8,0-1.2-0.2-1.2-1v-7h-3v14c0,0.8-0.7,1.3-1.5,1.3c-0.8,0-1.5-0.5-1.5-1.3V11h-3v3h-1v6h1v14c0,1.6,1.4,3,3,3h20
+c1.6,0,3-1.4,3-3V20h1V14z" />
 </vector>
\ No newline at end of file
diff --git a/res/layout/bottom_actions.xml b/res/layout/bottom_actions.xml
index 0b6c3ed..eea6d7a 100644
--- a/res/layout/bottom_actions.xml
+++ b/res/layout/bottom_actions.xml
@@ -30,7 +30,7 @@
                     android:layout_height="30dp"
                     android:layout_gravity="top|center_horizontal"
                     android:layout_margin="8dp"
-                    android:src="@drawable/ic_quickthemes"/>
+                    android:src="@drawable/ic_appthemer"/>
                 <ImageView
                     android:id="@+id/new_tag"
                     android:layout_width="wrap_content"
diff --git a/res/mipmap-hdpi/ic_app_themes.png b/res/mipmap-hdpi/ic_app_themes.png
index 4dcbd89..aa08c8b 100644
--- a/res/mipmap-hdpi/ic_app_themes.png
+++ b/res/mipmap-hdpi/ic_app_themes.png
diff --git a/res/mipmap-mdpi/ic_app_themes.png b/res/mipmap-mdpi/ic_app_themes.png
index b98d6b9..32f7456 100644
--- a/res/mipmap-mdpi/ic_app_themes.png
+++ b/res/mipmap-mdpi/ic_app_themes.png
diff --git a/res/mipmap-xhdpi/ic_app_themes.png b/res/mipmap-xhdpi/ic_app_themes.png
index bf5ea54..b629a6a 100644
--- a/res/mipmap-xhdpi/ic_app_themes.png
+++ b/res/mipmap-xhdpi/ic_app_themes.png
diff --git a/res/mipmap-xxhdpi/ic_app_themes.png b/res/mipmap-xxhdpi/ic_app_themes.png
index 6d59900..974eb6f 100644
--- a/res/mipmap-xxhdpi/ic_app_themes.png
+++ b/res/mipmap-xxhdpi/ic_app_themes.png
diff --git a/res/mipmap-xxxhdpi/ic_app_themes.png b/res/mipmap-xxxhdpi/ic_app_themes.png
index 21576a9..639764d 100644
--- a/res/mipmap-xxxhdpi/ic_app_themes.png
+++ b/res/mipmap-xxxhdpi/ic_app_themes.png
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 854d5ed..0a3c701 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -60,6 +60,9 @@
     <color name="per_app_theme_list_item_applied_text_color">#80ffffff</color>
     <color name="per_app_theme_remove_background_normal">#0fb6df</color>
     <color name="per_app_theme_remove_background_hover">#4fdcff</color>
+    <color name="per_app_theme_qs_icon_color">#ffffff</color>
+
+    <color name="bottom_row_icon_color">#ffffff</color>
 
     <color name="edge_effect_color">#ffffff</color>