diff options
| author | Irfan Sheriff <isheriff@android.com> | 2012-03-01 23:57:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 23:57:12 -0800 |
| commit | 6c9c305b28a33a7272ded543650223638ea5836d (patch) | |
| tree | ea761e6d122f7860fd2209e768f41a3ae226ee5c /res | |
| parent | bb826f26cb36261b06e218a0c76e3bc6d518314f (diff) | |
| parent | f91e52c986f4e7f8094a794c471813ac05d5d59c (diff) | |
| download | packages_apps_Settings-6c9c305b28a33a7272ded543650223638ea5836d.zip packages_apps_Settings-6c9c305b28a33a7272ded543650223638ea5836d.tar.gz packages_apps_Settings-6c9c305b28a33a7272ded543650223638ea5836d.tar.bz2 | |
am f91e52c9: am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit 'f91e52c986f4e7f8094a794c471813ac05d5d59c':
Enable EAP-pwd configuration in WiFi Settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/wifi_dialog.xml | 18 | ||||
| -rw-r--r-- | res/values/arrays.xml | 3 |
2 files changed, 15 insertions, 6 deletions
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 1b4d062..f06c332 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -63,7 +63,8 @@ style="@style/wifi_section" android:visibility="gone"> - <LinearLayout + <LinearLayout android:id="@+id/l_method" + android:visibility="gone" style="@style/wifi_item" > <TextView style="@style/wifi_item_label" @@ -75,7 +76,8 @@ android:entries="@array/wifi_eap_method" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/l_phase2" + android:visibility="gone" style="@style/wifi_item" > <TextView style="@style/wifi_item_label" @@ -87,7 +89,8 @@ android:entries="@array/wifi_phase2_entries" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/l_ca_cert" + android:visibility="gone" style="@style/wifi_item" > <TextView style="@style/wifi_item_label" @@ -98,7 +101,8 @@ android:prompt="@string/wifi_eap_ca_cert" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/l_user_cert" + android:visibility="gone" style="@style/wifi_item" > <TextView style="@style/wifi_item_label" @@ -109,7 +113,8 @@ android:prompt="@string/wifi_eap_user_cert" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/l_identity" + android:visibility="gone" style="@style/wifi_item" > <TextView style="@style/wifi_item_label" @@ -121,7 +126,8 @@ android:inputType="textNoSuggestions" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/l_anonymous" + android:visibility="gone" style="@style/wifi_item" > <TextView style="@style/wifi_item_label" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8c7ebfc..e89c00c 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -315,6 +315,8 @@ <item>TLS</item> <!-- Do not translate. --> <item>TTLS</item> + <!-- Do not translate. --> + <item>PWD</item> </string-array> <!-- Wi-Fi WPS setup for p2p connections. --> @@ -424,6 +426,7 @@ <item>PEAP</item> <item>TLS</item> <item>TTLS</item> + <item>PWD</item> </string-array> <!-- Phase 2 options --> |