commit 61b0f8c88ab6c8254230aa7953bf619934d7d756
author Irfan Sheriff <isheriff@android.com> Thu Jan 24 11:30:12 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 24 11:30:12 2013 -0800
tree a6c0debc024af8390178ce95bb94ecb4ff04dac8
parent a6c51f3d0b1b43aa3e27bd98639f0ad3acf22ecc
parent b1ea6805d98bf953448db350ae33e53c3c3b797d

am b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"

# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit 'b1ea6805d98bf953448db350ae33e53c3c3b797d':
  Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 14e1fc8..88c8323 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -298,12 +298,10 @@
 
    <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
    <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
-    <string-array name="wifi_ap_security" translatable="false">
-        <item>Open</item>
-        <!-- Do not translate. -->
-        <item>WPA PSK</item>
-        <!-- Do not translate. -->
-        <item>WPA2 PSK</item>
+    <string-array name="wifi_ap_security">
+        <item>@string/wifi_security_none</item>
+        <item>@string/wifi_security_wpa</item>
+        <item>@string/wifi_security_wpa2</item>
     </string-array>
 
     <!-- Match this with the constants in WifiDialog. --> <skip />