PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."

Browse Source 
* commit 'c4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d':
  Enable EAP-pwd configuration in WiFi Settings.
This commit is contained in:
Irfan Sheriff
2012-03-01 22:55:17 -08:00
committed by Android Git Automerger
parent 9ae0b5a23d c4bf8cd955
commit f91e52c986
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/layout/wifi_dialog.xml
View File

@@ -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"

3
res/values/arrays.xml
View File

@@ -307,6 +307,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. -->
@@ -416,6 +418,7 @@
<item>PEAP</item>
<item>TLS</item>
<item>TTLS</item>
<item>PWD</item>
</string-array>
<!-- Phase 2 options -->