summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-06-26 15:57:43 -0700
committerSanket Padawe <sanketpadawe@google.com>2015-06-26 15:57:43 -0700
commit94c0b0d436200a948b40249b4f7df69f44dbba7c (patch)
tree7217caeb219137b4108fb6b560227b1352f67f48 /src/com/android/settings/wifi
parent1c19cb5edd7a366192f28a0d7eb47e0021e9bbdd (diff)
downloadpackages_apps_Settings-94c0b0d436200a948b40249b4f7df69f44dbba7c.zip
packages_apps_Settings-94c0b0d436200a948b40249b4f7df69f44dbba7c.tar.gz
packages_apps_Settings-94c0b0d436200a948b40249b4f7df69f44dbba7c.tar.bz2
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
Bug: 22014309 Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
Diffstat (limited to 'src/com/android/settings/wifi')
-rw-r--r--src/com/android/settings/wifi/WifiConfigController.java11
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 1742c16..3ca9084 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);