diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-31 12:36:35 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-31 12:36:35 -0700 |
| commit | 05075242db8abe6d0b692b2238bac13360b39371 (patch) | |
| tree | 59cc2b207c64f56379eb1f61ef1be578f37f3a3b /src | |
| parent | 279cb4a5902ad9bd7e10cfce9e5e8f5b14b9e315 (diff) | |
| download | packages_apps_Settings-05075242db8abe6d0b692b2238bac13360b39371.tar.gz packages_apps_Settings-05075242db8abe6d0b692b2238bac13360b39371.tar.bz2 packages_apps_Settings-05075242db8abe6d0b692b2238bac13360b39371.zip | |
Enable UI for EAP-SIM/AKA/AKA'
We hide identity field for these; since dynamic
identities are now supported.
Change-Id: I5c6816b005ffbcdfa9aad953f5167d3dfd9de055
Diffstat (limited to 'src')
| -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 c0dbaa471..f13ecc377 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); |