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

Add EAP/802.1X configuration for WiFi Setting.

Browse Source 
1. Remove the isEnterprise() filter in Scanresult.
2. This requires the new fields such as identity, eap, certificate/key
to support EAP authentication in Wifi Settings.
3. Add simple file-based keystore to select the cert/key from UI.

-- Updated from the comments.
-- Fix the bug for passing null pointer for adding spinner items.
This commit is contained in:
Chung-yih Wang
2009-06-03 19:44:35 +08:00
parent 03a6110b4f
commit 0c1f89857a
7 changed files with 598 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
res/values/arrays.xml
View File

@@ -93,9 +93,13 @@
<!-- Do not translate. The Wi-Fi network has WEP security. -->
<item>WEP</item>
<!-- The Wi-Fi network has WPA personal security. WPA Personal is a tech term, and might be better left untranslated? -->
<item>WPA Personal</item>
<item>WPA personal</item>
<!-- The Wi-Fi network has WPA2 personal security. WPA Personal is a tech term, and might be better left untranslated? -->
<item>WPA2 Personal</item>
<item>WPA2 personal</item>
<!-- The Wi-Fi network has WPA EAP extensible authentication protocol. -->
<item>WPA-EAP</item>
<!-- IEEE 802.1X key management -->
<item>IEEE 802.1x</item>
</string-array>
<!-- Match this with code. --> <skip />
@@ -106,9 +110,14 @@
<!-- Do not translate. The Wi-Fi network has WEP security. -->
<item>WEP</item>
<!-- The Wi-Fi network has WPA personal security. WPA Personal is a tech term, and might be better left untranslated? -->
<item>WPA Personal</item>
<item>WPA personal</item>
<!-- The Wi-Fi network has WPA2 personal security. WPA Personal is a tech term, and might be better left untranslated? -->
<item>WPA2 Personal</item>
<item>WPA2 personal</item>
<!-- The Wi-Fi network has WPA enterprise security. WPA Enterprise is a tech term, and might be better left untranslated? -->
<!-- The Wi-Fi network has WPA EAP extensible authentication protocol. -->
<item>WPA-EAP</item>
<!-- IEEE 802.1X key management -->
<item>IEEE 802.1x</item>
</string-array>
<!-- Match this with code. --> <skip />
@@ -167,4 +176,20 @@
<item>Application Name</item>
</string-array>
<!-- EAP method -->
<string-array name="wifi_eap_entries">
<item>PEAP</item>
<item>TLS</item>
<item>TTLS</item>
</string-array>
<!-- Phase 2 options -->
<string-array name="wifi_phase2_entries">
<item>None</item>
<item>PAP</item>
<item>MSCHAP</item>
<item>MSCHAP2</item>
<item>GTC</item>
</string-array>
</resources>

25
res/values/strings.xml
View File

@@ -614,6 +614,11 @@
<string name="wifi_security_wpa">WPA</string>
<!-- Value for the wifi security -->
<string name="wifi_security_wpa2">WPA2</string>
<!-- Value for the wifi security -->
<string name="wifi_security_wpa_eap">WPA-EAP</string>
<!-- Value for the wifi security -->
<string name="wifi_security_ieee8021x">IEEE8021X</string>
<!-- Value for the wifi security when it is unknown -->
<string name="wifi_security_unknown">Unknown</string>
<!-- Verbose security type of a wifi network. Open means no security. -->
@@ -624,6 +629,10 @@
<string name="wifi_security_verbose_wpa">Secured with WPA</string>
<!-- Verbose security type of a wifi network. -->
<string name="wifi_security_verbose_wpa2">Secured with WPA2</string>
<!-- Verbose security type of a wifi network. -->
<string name="wifi_security_verbose_wpa_eap">Secured with WPA-EAP</string>
<!-- Verbose security type of a wifi network. -->
<string name="wifi_security_verbose_ieee8021x">Secured with IEEE 802.1x</string>
<!-- Wi-Fi IP addrress label -->
<string name="ip_address">IP address</string>
<!-- Label for the signal strength -->
@@ -648,6 +657,22 @@
<string name="connect">Connect</string>
<!-- Dialog title for when the user is trying to connect to a particular network-->
<string name="connect_to_blank">Connect to <xliff:g id="network_name">%1$s</xliff:g></string>
<!-- Caption for the eap method -->
<string name="please_select_eap">EAP method</string>
<!-- Caption for the phase2 -->
<string name="please_select_phase2">Phase 2 authentication</string>
<!-- Caption for the identity -->
<string name="please_type_identity">Identity</string>
<!-- Caption for the anonymous_identity -->
<string name="please_type_anonymous_identity">Anonymous identity</string>
<!-- Caption for the client_certificate -->
<string name="please_select_client_certificate">Client certificate</string>
<!-- Caption for the ca certificate -->
<string name="please_select_ca_certificate">CA certificate</string>
<!-- Caption for the Private Key -->
<string name="please_select_private_key">Private key</string>
<!-- Caption for the private key passwd -->
<string name="please_type_private_key_passwd">Private key password</string>
<!-- Caption for the wireless password -->
<string name="please_type_passphrase">Wireless password</string>
<!--Wi-Fi settings screen, connect to network dialog box, field label and hint text -->