diff options
author | Irfan Sheriff <isheriff@google.com> | 2010-06-03 11:14:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 11:14:40 -0700 |
commit | ca61c255785b2b6be8ec6cbdd096843c0539bc42 (patch) | |
tree | 3a0a41bdbfdeec18431ffbb1d59677b6bb8122fe | |
parent | 4223830c65d99c0db03557ab23bd628db7e76f9f (diff) | |
parent | a496684019497395b71c6d460501197a74e21e0e (diff) | |
download | packages_apps_Settings-ca61c255785b2b6be8ec6cbdd096843c0539bc42.zip packages_apps_Settings-ca61c255785b2b6be8ec6cbdd096843c0539bc42.tar.gz packages_apps_Settings-ca61c255785b2b6be8ec6cbdd096843c0539bc42.tar.bz2 |
am a4966840: am de3e5665: Add phase2 authentication settings
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken
* commit 'a496684019497395b71c6d460501197a74e21e0e':
Add phase2 authentication settings
-rw-r--r-- | res/layout/wifi_dialog.xml | 13 | ||||
-rw-r--r-- | res/values-cs/strings.xml | 1 | ||||
-rw-r--r-- | res/values-da/strings.xml | 1 | ||||
-rw-r--r-- | res/values-de/strings.xml | 1 | ||||
-rw-r--r-- | res/values-el/strings.xml | 1 | ||||
-rw-r--r-- | res/values-es-rUS/strings.xml | 1 | ||||
-rw-r--r-- | res/values-es/strings.xml | 1 | ||||
-rw-r--r-- | res/values-fr/strings.xml | 1 | ||||
-rw-r--r-- | res/values-it/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ja/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ko/strings.xml | 1 | ||||
-rw-r--r-- | res/values-nb/strings.xml | 1 | ||||
-rw-r--r-- | res/values-nl/strings.xml | 1 | ||||
-rw-r--r-- | res/values-pl/strings.xml | 1 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 1 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ru/strings.xml | 1 | ||||
-rw-r--r-- | res/values-sv/strings.xml | 1 | ||||
-rw-r--r-- | res/values-tr/strings.xml | 1 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 1 | ||||
-rw-r--r-- | res/values-zh-rTW/strings.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/settings/wifi/WifiDialog.java | 6 |
23 files changed, 41 insertions, 0 deletions
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 6558453..081ab6c 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -89,6 +89,19 @@ <TextView style="?android:attr/textAppearanceSmallInverse" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:text="@string/please_select_phase2" /> + + <Spinner android:id="@+id/phase2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/please_select_phase2" + android:entries="@array/wifi_phase2_entries" /> + + <TextView + style="?android:attr/textAppearanceSmallInverse" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dip" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index fb41207..179fa66 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Rychlost připojení"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Adresa IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Ověření Phase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certifikát CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certifikát uživatele"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index ada382d..820d69b 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Linkhastighed"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-godkendelse"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Brugercertifikat"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 902a156..50c6736c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Verbindungsgeschwindigkeit"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP-Adresse"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-Methode"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-Authentifizierung"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-Zertifikat"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Nutzerzertifikat"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 6c64a1c..2191925 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Ταχύτητα σύνδεσης"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Διεύθυνση IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Μέθοδος EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"2η φάση ελέγχου ταυτότητας"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Πιστοποιητικό CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Πιστοποιητικό χρήστη"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Ταυτότητα"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index dd52f0c..f6119da 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Velocidad del vínculo"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Método de EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado del usuario"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index ae3f211..aca183f 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Velocidad de enlace"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado de usuario"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index b8b1097..41cb709 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Vitesse de connexion"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Adresse IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Méthode EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Authentification phase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificat utilisateur"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 1f0a341..585300b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Velocità di collegamento"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Indirizzo IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Metodo EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Autenticazione fase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificato CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificato utente"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 2f52760..f5d4352 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -362,6 +362,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"リンク速度"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IPアドレス"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP方式"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"フェーズ2認証"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA証明書"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ユーザー証明書"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 743f3e1..e7055fe 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"링크 속도"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP 주소"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 방식"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"단계 2 인증"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 인증서"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"사용자 인증서"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 1171d9c..b142281 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Koblingshastighet"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-autentisering"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-sertifikat"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Klientsertifikat"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 703a76b..af69001 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -353,6 +353,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Linksnelheid"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adres"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-methode"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-verificatie"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certificaat"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Gebruikerscertificaat"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a5452ba..2a4871f 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -358,6 +358,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Szybkość łącza"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Adres IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Uwierzytelnianie Phase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certyfikat urzędu certyfikacji"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certyfikat użytkownika"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 54a5d8a..cd112cb 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Velocidade da ligação"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"método EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da fase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado do utilizador"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 3f77c54..48a5c8c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Velocidade do link"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da Fase 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado do usuário"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1ad17fd..02a803b 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP-адрес"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Метод EAP"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"2-й этап аутентификации"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Сертификат центра сертификации"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Сертификат пользователя"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Пользователь"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 7fe0786..2ad4e4b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Länkhastighet"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adress"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metod"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Autentisering för fas 2"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Användarcertifikat"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 4a483db..6a5f524 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"Bağlantı hızı"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP adresi"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP yöntemi"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"Aşama 2 için kimlik doğrulaması"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA sertifikası"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Kullanıcı sertifikası"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 81d568a..5a71779 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"连接速度"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP 地址"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"阶段 2 身份验证"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 证书"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"用户证书"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"身份"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 4840836..76b1555 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -364,6 +364,7 @@ <string name="wifi_speed" msgid="3526198708812322037">"連線速度"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"IP 位址"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string> + <string name="please_select_phase2" msgid="5231074529772044898">"階段 2 驗證"</string> <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 憑證"</string> <string name="wifi_eap_user_cert" msgid="1291089413368160789">"使用者憑證"</string> <string name="wifi_eap_identity" msgid="4359453783379679103">"識別"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2866f8e..a9eba4c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -814,6 +814,8 @@ <string name="wifi_ip_address">IP address</string> <!-- Label for the EAP method of the network --> <string name="wifi_eap_method">EAP method</string> + <!-- Label for the phase2 --> + <string name="please_select_phase2">Phase 2 authentication</string> <!-- Label for the EAP CA certificate of the network --> <string name="wifi_eap_ca_cert">CA certificate</string> <!-- Label for the EAP user certificate of the network --> diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java index f85d054..a8bf717 100644 --- a/src/com/android/settings/wifi/WifiDialog.java +++ b/src/com/android/settings/wifi/WifiDialog.java @@ -60,6 +60,7 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, private Spinner mEapMethod; private Spinner mEapCaCert; + private Spinner mPhase2; private Spinner mEapUserCert; private TextView mEapIdentity; private TextView mEapAnonymous; @@ -141,6 +142,9 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, config.allowedKeyManagement.set(KeyMgmt.WPA_EAP); config.allowedKeyManagement.set(KeyMgmt.IEEE8021X); config.eap.setValue((String) mEapMethod.getSelectedItem()); + + config.phase2.setValue((mPhase2.getSelectedItemPosition() == 0) ? "" : + "auth=" + mPhase2.getSelectedItem()); config.ca_cert.setValue((mEapCaCert.getSelectedItemPosition() == 0) ? "" : KEYSTORE_SPACE + Credentials.CA_CERTIFICATE + (String) mEapCaCert.getSelectedItem()); @@ -302,6 +306,7 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, if (mEapMethod == null) { mEapMethod = (Spinner) mView.findViewById(R.id.method); + mPhase2 = (Spinner) mView.findViewById(R.id.phase2); mEapCaCert = (Spinner) mView.findViewById(R.id.ca_cert); mEapUserCert = (Spinner) mView.findViewById(R.id.user_cert); mEapIdentity = (TextView) mView.findViewById(R.id.identity); @@ -313,6 +318,7 @@ class WifiDialog extends AlertDialog implements View.OnClickListener, if (mAccessPoint != null && mAccessPoint.networkId != -1) { WifiConfiguration config = mAccessPoint.getConfig(); setSelection(mEapMethod, config.eap.value()); + setSelection(mPhase2, config.phase2.value()); setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE, config.ca_cert.value()); setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY, |