diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-02-06 19:03:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-06 19:03:37 +0000 |
| commit | e58d6da635064146538e4135336ead39a8324caf (patch) | |
| tree | 9a83f7a7ef605ec12e01a2c193527cbc438b89eb /src/com/android/settings/wifi | |
| parent | 4cd0f1191b347df8cf0a550bcfd710c9c7c2bc13 (diff) | |
| parent | d181bb62bc26c797209e0f355e655ba2559285e1 (diff) | |
| download | packages_apps_Settings-e58d6da635064146538e4135336ead39a8324caf.tar.gz packages_apps_Settings-e58d6da635064146538e4135336ead39a8324caf.tar.bz2 packages_apps_Settings-e58d6da635064146538e4135336ead39a8324caf.zip | |
Merge "Fix EAP field display for a new network"
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 373763d8d..c412b37b5 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -612,6 +612,11 @@ public class WifiConfigController implements TextWatcher, setSelection(mEapUserCertSpinner, config.enterpriseConfig.getClientCertificate()); mEapIdentityView.setText(config.enterpriseConfig.getIdentity()); mEapAnonymousView.setText(config.enterpriseConfig.getAnonymousIdentity()); + } else { + // Choose a default for a new network and show only appropriate + // fields + mEapMethodSpinner.setSelection(Eap.PEAP); + showEapFieldsByMethod(Eap.PEAP); } } else { showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition()); |