summaryrefslogtreecommitdiffstats
path: root/res/values/arrays.xml
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2012-03-05 16:09:48 -0800
committerEric Fischer <enf@google.com>2012-03-05 16:09:48 -0800
commitb7fa58cc9e8c81fdacab3f76f2bb989e3ab8c91d (patch)
tree72f8d1f690ab93eb735e303e40ef2da91f79839d /res/values/arrays.xml
parent1d832c66e21c60ab11b316d77fd0a9f5d20e9c90 (diff)
downloadpackages_apps_Settings-b7fa58cc9e8c81fdacab3f76f2bb989e3ab8c91d.zip
packages_apps_Settings-b7fa58cc9e8c81fdacab3f76f2bb989e3ab8c91d.tar.gz
packages_apps_Settings-b7fa58cc9e8c81fdacab3f76f2bb989e3ab8c91d.tar.bz2
Also restore a deleted array that is still referenced.
Change-Id: I6b9aecd9dc634eb55c2d256ab9dc9f623ad4feb5
Diffstat (limited to 'res/values/arrays.xml')
-rw-r--r--res/values/arrays.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c9bbd04..00e1371 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -438,6 +438,20 @@
<item>GTC</item>
</string-array>
+ <!-- Wi-Fi set up options -->
+ <!-- Note that adding/removing/moving items will need wifi settings code ch
+ange. -->
+ <string-array name="wifi_network_setup">
+ <!-- Manual wifi configuration [CHAR LIMIT=25]-->
+ <item>Off</item>
+ <!-- WPS is a new standard that allowes secure connection establishment to a home wireless network using a simplified process. WPS push button based configuration involves pushing a button on the router and the device [CHAR LIMIT=25]-->
+ <item>Push button</item>
+ <!-- WPS pin method based configuration. This requires entering a pin obtained from the access point [CHAR LIMIT=25] -->
+ <item>PIN from access point</item>
+ <!-- WPS pin method based configuration. This requires generating a pin from this device [CHAR LIMIT=25] -->
+ <item>PIN from this device</item>
+ </string-array>
+
<!-- Wi-Fi IP settings. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ip_settings">