summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-06-18 11:20:24 -0700
committerPauloftheWest <paulofthewest@google.com>2014-06-27 12:52:56 -0700
commitb4564c39b734227cd67e46d738caa6fb9d89c4cb (patch)
tree4329ffb3965f1b753dc66759bcb373eb6538e9a9 /res
parent0e6ffc429d0b3e40e9c72dd2cca0ef5b1942e905 (diff)
downloadpackages_apps_Settings-b4564c39b734227cd67e46d738caa6fb9d89c4cb.zip
packages_apps_Settings-b4564c39b734227cd67e46d738caa6fb9d89c4cb.tar.gz
packages_apps_Settings-b4564c39b734227cd67e46d738caa6fb9d89c4cb.tar.bz2
Applied some minor UI changes (see below)
+ Changed wifi icons to teal + Removed “Secured with …” from network status + Added an empty state image above text when Wi-Fi is off + Removed Wi-Fi Direct and WPS Push button from overflow menu + Added Wi-Fi Direct and WPS Push button to Advance Activity + Input Password Dialog: Moved Signal Strength and Security to Advance + Input Password Dialog: Updated Password text to Material style BugId: #15698824 #15702808 Change-Id: I542ab9aac2c098738330c92d9183d3907c4f0b38
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_wifi_emptystate.pngbin0 -> 6129 bytes
-rw-r--r--res/drawable-mdpi/ic_wifi_emptystate.pngbin0 -> 3956 bytes
-rw-r--r--res/drawable-xhdpi/ic_wifi_emptystate.pngbin0 -> 8323 bytes
-rw-r--r--res/drawable-xxhdpi/ic_wifi_emptystate.pngbin0 -> 14075 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_wifi_emptystate.pngbin0 -> 12336 bytes
-rw-r--r--res/layout/wifi_dialog.xml2
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/values/themes.xml2
-rw-r--r--res/xml/wifi_advanced_settings.xml10
9 files changed, 18 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_wifi_emptystate.png b/res/drawable-hdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..0192537
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_emptystate.png b/res/drawable-mdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..15f8df8
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_emptystate.png b/res/drawable-xhdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..7853cb0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_emptystate.png b/res/drawable-xxhdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..6f47efb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_emptystate.png b/res/drawable-xxxhdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..9975f68
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index d0ae981..077134e 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -148,6 +148,8 @@
style="@style/wifi_item" >
<TextView
style="@style/wifi_item_label"
+ android:textAppearance="@android:style/TextAppearance.Material.Body2"
+ android:textColor="?android:attr/colorAccent"
android:text="@string/wifi_password" />
<EditText android:id="@+id/password"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb44423..ea6ece6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1255,6 +1255,11 @@
<string name="wifi_display_listen_channel" translatable="false">Listen channel</string>
<!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
<string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
+ <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+ <string name="wifi_band_24ghz" translatable="false">2.4GHz</string>
+ <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+ <string name="wifi_band_5ghz" translatable="false">5GHz</string>
+
<!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC -->
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c1e6b7c..ee02768 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -79,7 +79,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_dark</item>
+ <item name="wifi_signal">@drawable/wifi_signal_light</item>
<item name="@*android:actionBarSize">@dimen/actionbar_size</item>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index d250585..efa94b2 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -58,6 +58,16 @@
android:title="@string/wifi_install_credentials"
android:persistent="false" />
+ <Preference
+ android:key="wifi_direct"
+ android:title="@string/wifi_menu_p2p"
+ android:persistent="false" />
+
+ <Preference
+ android:key="wps_push_button"
+ android:title="@string/wifi_menu_wps_pbc"
+ android:persistent="false" />
+
<CheckBoxPreference
android:key="suspend_optimizations"
android:title="@string/wifi_suspend_optimizations"