From f6991a26ea6b9e9ef196e27d28f2d78fa007cd81 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 20 Apr 2015 14:05:55 -0700
Subject: [PATCH] [WifiSetup] Update Wi-Fi icon colors

For the new blue-themed setup wizard, update the colors of the Wi-Fi
icons. This reuses the abandoned wifi_signal_colored XML, update it
to reference the new material wifi_signal_teal icon. Only the shape
of wifi_signal_teal is used. Tint is applied to the icon so that the
actual color is defined by wifi_signal_color attr in the theme.

Bug: 19729981
Change-Id: I59a8c137086f2e80eb7e10880626098243b14d13
---
 res/drawable/wifi_signal_colored.xml | 16 ++++++++--------
 res/values/colors.xml                |  4 ++--
 res/values/themes.xml                |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/drawable/wifi_signal_colored.xml b/res/drawable/wifi_signal_colored.xml
index 4eb41c0623c..91f8b88a530 100644
--- a/res/drawable/wifi_signal_colored.xml
+++ b/res/drawable/wifi_signal_colored.xml
@@ -20,22 +20,22 @@
         <level-list>
             <item android:maxLevel="0">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_1_light"
+                    android:src="@drawable/ic_wifi_lock_signal_1_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="1">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_2_light"
+                    android:src="@drawable/ic_wifi_lock_signal_2_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="2">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_3_light"
+                    android:src="@drawable/ic_wifi_lock_signal_3_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="3">
                 <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_4_light"
+                    android:src="@drawable/ic_wifi_lock_signal_4_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
         </level-list>
@@ -44,22 +44,22 @@
         <level-list>
             <item android:maxLevel="0">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_1_light"
+                    android:src="@drawable/ic_wifi_signal_1_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="1">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_2_light"
+                    android:src="@drawable/ic_wifi_signal_2_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="2">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_3_light"
+                    android:src="@drawable/ic_wifi_signal_3_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
             <item android:maxLevel="3">
                 <bitmap
-                    android:src="@drawable/ic_wifi_signal_4_light"
+                    android:src="@drawable/ic_wifi_signal_4_teal"
                     android:tint="?attr/wifi_signal_color" />
             </item>
         </level-list>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index dd7382fd189..e9da7fed411 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,8 +47,8 @@
     <color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color>
     <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
     <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
-    <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
-    <color name="setup_wizard_wifi_color_light">#ff0096a6</color>
+    <color name="setup_wizard_wifi_color_dark">#ff448aff</color>
+    <color name="setup_wizard_wifi_color_light">#ff3367d6</color>
 
     <color name="lock_pattern_background">#00000000</color>
     <color name="lock_pattern_view_regular_color">#ff37474f</color>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0d281269cd1..2c900bb773a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,7 +41,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
@@ -62,7 +62,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->