PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '0507524' into merge_work

Browse Source
This commit is contained in:
Prerepa Viswanadham
2015-04-10 15:43:14 -07:00
parent d333a7d9f1 05075242db
commit 1d7dc74b45
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/arrays.xml
View File

@@ -316,6 +316,12 @@
<item>TTLS</item>
<!-- Do not translate. -->
<item>PWD</item>
<!-- Do not translate. -->
<item>SIM</item>
<!-- Do not translate. -->
<item>AKA</item>
<!-- Do not translate. -->
<item>AKA\'</item>
</string-array>
<!-- Wi-Fi WPS setup for p2p connections. -->

17
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -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);