diff options
| -rw-r--r-- | res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 17 |
2 files changed, 23 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f0462f3..c108a21 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -316,6 +316,12 @@ <item>TTLS</item> <!-- Do not translate. --> <item>PWD</item> + <!-- Do not translate. --> + <item>SIM</item> + <!-- Do not translate. --> + <item>AKA</item> + <!-- Do not translate. --> + <item>AKA\'</item> </string-array> <!-- Wi-Fi WPS setup for p2p connections. --> diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index c0dbaa4..f13ecc3 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -92,6 +92,9 @@ public class WifiConfigController implements TextWatcher, public static final int WIFI_EAP_METHOD_TLS = 1; public static final int WIFI_EAP_METHOD_TTLS = 2; public static final int WIFI_EAP_METHOD_PWD = 3; + public static final int WIFI_EAP_METHOD_SIM = 4; + public static final int WIFI_EAP_METHOD_AKA = 5; + public static final int WIFI_EAP_METHOD_AKA_PRIME = 6; /* These values come from "wifi_peap_phase2_entries" resource array */ public static final int WIFI_PEAP_PHASE2_NONE = 0; @@ -762,9 +765,23 @@ public class WifiConfigController implements TextWatcher, mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE); setUserCertInvisible(); break; + case WIFI_EAP_METHOD_SIM: + case WIFI_EAP_METHOD_AKA: + case WIFI_EAP_METHOD_AKA_PRIME: + setPhase2Invisible(); + setAnonymousIdentInvisible(); + setUserCertInvisible(); + setPasswordInvisible(); + setIdentityInvisible(); + break; } } + private void setIdentityInvisible() { + mView.findViewById(R.id.l_identity).setVisibility(View.GONE); + mPhase2Spinner.setSelection(Phase2.NONE); + } + private void setPhase2Invisible() { mView.findViewById(R.id.l_phase2).setVisibility(View.GONE); mPhase2Spinner.setSelection(Phase2.NONE); |