diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 65584535030..081ab6c56d2 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -87,6 +87,19 @@ android:prompt="@string/wifi_eap_method" android:entries="@array/wifi_eap_method" /> + + + + "Rychlost připojení" "Adresa IP" "Metoda EAP" + "Ověření Phase 2" "Certifikát CA" "Certifikát uživatele" "Identita" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 79b658a416a..affbb6cbdfe 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -350,6 +350,7 @@ "Linkhastighed" "IP-adresse" "EAP-metode" + "Fase 2-godkendelse" "CA-certifikat" "Brugercertifikat" "Identitet" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index d811fd95bad..98378026073 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -350,6 +350,7 @@ "Verbindungsgeschwindigkeit" "IP-Adresse" "EAP-Methode" + "Phase 2-Authentifizierung" "CA-Zertifikat" "Nutzerzertifikat" "Identität" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 5fe6def8cc9..c049e0b3513 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -350,6 +350,7 @@ "Ταχύτητα σύνδεσης" "Διεύθυνση IP" "Μέθοδος EAP" + "2η φάση ελέγχου ταυτότητας" "Πιστοποιητικό CA" "Πιστοποιητικό χρήστη" "Ταυτότητα" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 7a7d45753ce..54a977e03e6 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -350,6 +350,7 @@ "Velocidad del vínculo" "Dirección IP" "Método de EAP" + "Autenticación de fase 2" "Certificado de CA" "Certificado del usuario" "Identidad" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 6c3132784ee..cde10d3bb43 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -350,6 +350,7 @@ "Velocidad de enlace" "Dirección IP" "Método EAP" + "Autenticación de fase 2" "Certificado de CA" "Certificado de usuario" "Identidad" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 27abb175413..04959763466 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -350,6 +350,7 @@ "Vitesse de connexion" "Adresse IP" "Méthode EAP" + "Authentification phase 2" "Certificat CA" "Certificat utilisateur" "Identité" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a04dabbf416..a322c5fd6a3 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -350,6 +350,7 @@ "Velocità di collegamento" "Indirizzo IP" "Metodo EAP" + "Autenticazione fase 2" "Certificato CA" "Certificato utente" "Identità" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7f72a53e177..12d2cb0e684 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -350,6 +350,7 @@ "リンク速度" "IPアドレス" "EAP方式" + "フェーズ2認証" "CA証明書" "ユーザー証明書" "ID" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index b4347664b26..4a329d6c4c3 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -350,6 +350,7 @@ "링크 속도" "IP 주소" "EAP 방식" + "단계 2 인증" "CA 인증서" "사용자 인증서" "ID" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 497863fe0c7..48e219b91f6 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -350,6 +350,7 @@ "Koblingshastighet" "IP-adresse" "EAP-metode" + "Fase 2-autentisering" "CA-sertifikat" "Klientsertifikat" "Identitet" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4f6c765cfb6..ae909f95191 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -350,6 +350,7 @@ "Linksnelheid" "IP-adres" "EAP-methode" + "Phase 2-verificatie" "CA-certificaat" "Gebruikerscertificaat" "Identiteit" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 378d295b777..c1ed60c2e4d 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -350,6 +350,7 @@ "Szybkość łącza" "Adres IP" "Metoda EAP" + "Uwierzytelnianie Phase 2" "Certyfikat urzędu certyfikacji" "Certyfikat użytkownika" "Tożsamość" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 8ea989691fe..6e0786b5e42 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -350,6 +350,7 @@ "Velocidade da ligação" "Endereço IP" "método EAP" + "Autenticação da fase 2" "Certificado CA" "Certificado do utilizador" "Identidade" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 476d5ed7e20..e4f53e10658 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -350,6 +350,7 @@ "Velocidade do link" "Endereço IP" "Método EAP" + "Autenticação da Fase 2" "Certificado CA" "Certificado do usuário" "Identidade" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index ed3a374a10d..f128c60bdf3 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -350,6 +350,7 @@ "Скорость связи" "IP-адрес" "Метод EAP" + "2-й этап аутентификации" "Сертификат центра сертификации" "Сертификат пользователя" "Пользователь" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index b400be37670..151cf9a19e2 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -350,6 +350,7 @@ "Länkhastighet" "IP-adress" "EAP-metod" + "Autentisering för fas 2" "CA-certifikat" "Användarcertifikat" "Identitet" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index aa79d5bab47..4fa6d602cc1 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -350,6 +350,7 @@ "Bağlantı hızı" "IP adresi" "EAP yöntemi" + "Aşama 2 için kimlik doğrulaması" "CA sertifikası" "Kullanıcı sertifikası" "Kimlik" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index ab79aacdf0f..baa213e2204 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -350,6 +350,7 @@ "连接速度" "IP 地址" "EAP 方法" + "阶段 2 身份验证" "CA 证书" "用户证书" "身份" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 57d5f2ee3e4..5c6112965ad 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -350,6 +350,7 @@ "連線速度" "IP 位址" "EAP 方法" + "階段 2 驗證" "CA 憑證" "使用者憑證" "識別" diff --git a/res/values/strings.xml b/res/values/strings.xml index 6ab412d97ff..16a39947785 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -814,6 +814,8 @@ IP address EAP method + + Phase 2 authentication CA certificate diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java index f85d0542758..a8bf717ca8b 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,