diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-04-10 15:43:14 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-04-10 15:43:14 -0700 |
| commit | 1d7dc74b45db6c40954090fe2a2c0f0b934c69f3 (patch) | |
| tree | fb4a7ded5d58b62df24e29425858371c38cbaa3a /src/com | |
| parent | d333a7d9f10500ec45377e099955031017d6a158 (diff) | |
| parent | 05075242db8abe6d0b692b2238bac13360b39371 (diff) | |
| download | packages_apps_Settings-1d7dc74b45db6c40954090fe2a2c0f0b934c69f3.tar.gz packages_apps_Settings-1d7dc74b45db6c40954090fe2a2c0f0b934c69f3.tar.bz2 packages_apps_Settings-1d7dc74b45db6c40954090fe2a2c0f0b934c69f3.zip | |
Merge commit '0507524' into merge_work
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index cc8481d26..1503c6373 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -88,6 +88,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; @@ -734,9 +737,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); |