Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev

59 files changed, 70 insertions, 3 deletions

diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
index 28409db7f..5c82e8bcb 100644
--- a/res/drawable-hdpi/ic_settings_wireless.png
+++ b/res/drawable-hdpi/ic_settings_wireless.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png
new file mode 100644
index 000000000..d0c9b3045
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png
new file mode 100644
index 000000000..0bef89197
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png
new file mode 100644
index 000000000..9252d90f1
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png
new file mode 100644
index 000000000..a758ad47b
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png
new file mode 100644
index 000000000..8378399f9
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 000000000..3030279d9
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_0_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 000000000..3340d958f
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_1_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 000000000..180f7b1d5
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_2_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 000000000..af27fb0c5
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_3_teal.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 000000000..5c82e8bcb
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_4_teal.png
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
index 59ed4d458..6b81932f4 100644
--- a/res/drawable-mdpi/ic_settings_wireless.png
+++ b/res/drawable-mdpi/ic_settings_wireless.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png
new file mode 100644
index 000000000..d746c1e2d
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png
new file mode 100644
index 000000000..01f6f8750
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png
new file mode 100644
index 000000000..230b1a36c
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png
new file mode 100644
index 000000000..20fe9a5de
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png
new file mode 100644
index 000000000..938a2039c
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 000000000..9dcdf91f4
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_0_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 000000000..b58d5f46e
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_1_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 000000000..5cbb5a322
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_2_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 000000000..cec46b0a3
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_3_teal.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 000000000..6b81932f4
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_4_teal.png
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
index d7a6955a8..ad6a98ec4 100644
--- a/res/drawable-xhdpi/ic_settings_wireless.png
+++ b/res/drawable-xhdpi/ic_settings_wireless.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png
new file mode 100644
index 000000000..8d99e313b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png
new file mode 100644
index 000000000..da282b678
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png
new file mode 100644
index 000000000..b6a378f79
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png
new file mode 100644
index 000000000..7227b0868
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png
new file mode 100644
index 000000000..92257c328
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 000000000..08aba9676
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_0_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 000000000..8d282c9fb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 000000000..6caedf936
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 000000000..799c9e334
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_teal.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 000000000..ad6a98ec4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_teal.png
diff --git a/res/drawable-xxhdpi/ic_settings_wireless.png b/res/drawable-xxhdpi/ic_settings_wireless.png
index 4125f9fd7..3058e988e 100644
--- a/res/drawable-xxhdpi/ic_settings_wireless.png
+++ b/res/drawable-xxhdpi/ic_settings_wireless.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png
new file mode 100644
index 000000000..544c0412a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png
new file mode 100644
index 000000000..ac0cb625d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png
new file mode 100644
index 000000000..beb6e12cb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png
new file mode 100644
index 000000000..3eaaf39e8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png
new file mode 100644
index 000000000..8b6bfb1d9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 000000000..f28f0ad30
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 000000000..1728dc720
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 000000000..e7e4788c4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 000000000..c2967ed93
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 000000000..3058e988e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless.png b/res/drawable-xxxhdpi/ic_settings_wireless.png
index ed05fb3ec..bcc423370 100644
--- a/res/drawable-xxxhdpi/ic_settings_wireless.png
+++ b/res/drawable-xxxhdpi/ic_settings_wireless.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png
new file mode 100644
index 000000000..74c9c31cc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png
new file mode 100644
index 000000000..dab15c41c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png
new file mode 100644
index 000000000..66a7736ca
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png
new file mode 100644
index 000000000..d23cf22d6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png
new file mode 100644
index 000000000..83e49882f
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 000000000..3dc5cbe15
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 000000000..d80ac48fb
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 000000000..4fdd825b9
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 000000000..e1cbcb83c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 000000000..bcc423370
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png
diff --git a/res/drawable/wifi_signal_lock_teal.xml b/res/drawable/wifi_signal_lock_teal.xml
new file mode 100644
index 000000000..2e7927406
--- /dev/null
+++ b/res/drawable/wifi_signal_lock_teal.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     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.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_teal" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_teal" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_teal" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_teal" />
+</level-list>
+
diff --git a/res/drawable/wifi_signal_open_teal.xml b/res/drawable/wifi_signal_open_teal.xml
new file mode 100644
index 000000000..eb4ba8a48
--- /dev/null
+++ b/res/drawable/wifi_signal_open_teal.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     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.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_teal" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_teal" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_teal" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_teal" />
+</level-list>
+
diff --git a/res/drawable/wifi_signal_teal.xml b/res/drawable/wifi_signal_teal.xml
new file mode 100644
index 000000000..637336f02
--- /dev/null
+++ b/res/drawable/wifi_signal_teal.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_teal" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_teal" />
+</selector>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index aa463410b..ef5361800 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -35,7 +35,7 @@
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
+        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
         <item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_dark</item>
     </style>
 
@@ -52,7 +52,7 @@
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
+        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
         <item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_light</item>
     </style>
 
@@ -91,7 +91,7 @@
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>