[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
This commit is contained in:
Maurice Lam
2015-04-20 14:05:55 -07:00
parent e5112fe766
commit f6991a26ea
3 changed files with 12 additions and 12 deletions

View File

@@ -20,22 +20,22 @@
<level-list> <level-list>
<item android:maxLevel="0"> <item android:maxLevel="0">
<bitmap <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" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
<item android:maxLevel="1"> <item android:maxLevel="1">
<bitmap <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" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
<item android:maxLevel="2"> <item android:maxLevel="2">
<bitmap <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" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
<item android:maxLevel="3"> <item android:maxLevel="3">
<bitmap <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" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
</level-list> </level-list>
@@ -44,22 +44,22 @@
<level-list> <level-list>
<item android:maxLevel="0"> <item android:maxLevel="0">
<bitmap <bitmap
android:src="@drawable/ic_wifi_signal_1_light" android:src="@drawable/ic_wifi_signal_1_teal"
android:tint="?attr/wifi_signal_color" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
<item android:maxLevel="1"> <item android:maxLevel="1">
<bitmap <bitmap
android:src="@drawable/ic_wifi_signal_2_light" android:src="@drawable/ic_wifi_signal_2_teal"
android:tint="?attr/wifi_signal_color" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
<item android:maxLevel="2"> <item android:maxLevel="2">
<bitmap <bitmap
android:src="@drawable/ic_wifi_signal_3_light" android:src="@drawable/ic_wifi_signal_3_teal"
android:tint="?attr/wifi_signal_color" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
<item android:maxLevel="3"> <item android:maxLevel="3">
<bitmap <bitmap
android:src="@drawable/ic_wifi_signal_4_light" android:src="@drawable/ic_wifi_signal_4_teal"
android:tint="?attr/wifi_signal_color" /> android:tint="?attr/wifi_signal_color" />
</item> </item>
</level-list> </level-list>

View File

@@ -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_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_dark">#fff44336</color>
<color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</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_dark">#ff448aff</color>
<color name="setup_wizard_wifi_color_light">#ff0096a6</color> <color name="setup_wizard_wifi_color_light">#ff3367d6</color>
<color name="lock_pattern_background">#00000000</color> <color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color> <color name="lock_pattern_view_regular_color">#ff37474f</color>

View File

@@ -41,7 +41,7 @@
<item name="setup_divider_color">@color/setup_divider_color_dark</item> <item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="side_margin">0dip</item> <item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</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> <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<!-- LockPatternView colors --> <!-- LockPatternView colors -->
@@ -62,7 +62,7 @@
<item name="setup_divider_color">@color/setup_divider_color_light</item> <item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="side_margin">0dip</item> <item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</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> <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<!-- LockPatternView colors --> <!-- LockPatternView colors -->