diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-06-28 02:45:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-28 02:45:48 +0000 |
| commit | 52dce9d3340da087fadf4689a07c943d9a121071 (patch) | |
| tree | c00d8af653e2515aa44f5a1e678c1dfcec5a6f73 /src/com/android/settings/wifi | |
| parent | 473440d79b1b93fac06cba220f70181492855763 (diff) | |
| parent | 94c0b0d436200a948b40249b4f7df69f44dbba7c (diff) | |
| download | packages_apps_Settings-52dce9d3340da087fadf4689a07c943d9a121071.zip packages_apps_Settings-52dce9d3340da087fadf4689a07c943d9a121071.tar.gz packages_apps_Settings-52dce9d3340da087fadf4689a07c943d9a121071.tar.bz2 | |
Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index bc5f308..2777185 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -57,6 +57,7 @@ import android.widget.TextView; import com.android.settings.ProxySelector; import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; +import com.android.settings.Utils; import java.net.InetAddress; import java.net.Inet4Address; @@ -637,6 +638,16 @@ public class WifiConfigController implements TextWatcher, if (mEapMethodSpinner == null) { mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method); mEapMethodSpinner.setOnItemSelectedListener(this); + if (Utils.isWifiOnly(mContext) || !mContext.getResources().getBoolean( + com.android.internal.R.bool.config_eap_sim_based_auth_supported)) { + String[] eapMethods = mContext.getResources().getStringArray( + R.array.eap_method_without_sim_auth); + ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(mContext, + android.R.layout.simple_spinner_item, eapMethods); + spinnerAdapter.setDropDownViewResource( + android.R.layout.simple_spinner_dropdown_item); + mEapMethodSpinner.setAdapter(spinnerAdapter); + } mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2); mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert); mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert); |