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

Show "not configurable" screen in EAP

Browse Source 
Bug: 3175016
Change-Id: If67c0cbf41adee205c8b3eec410e39bc29c2f04d
This commit is contained in:
Daisuke Miyakawa
2010-12-15 12:27:59 -08:00
parent 0333f74b9c
commit dadf1e53cb
4 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,9 @@ public class WifiConfigController implements TextWatcher,
private ProxySettings mProxySettings;
private LinkProperties mLinkProperties = new LinkProperties();
// True when this instance is used in SetupWizard XL context.
private final boolean mInXlSetupWizard;
static boolean requireKeyStore(WifiConfiguration config) {
if (config == null) {
return false;
@@ -138,6 +141,7 @@ public class WifiConfigController implements TextWatcher,
public WifiConfigController(
WifiConfigUiBase parent, View view, AccessPoint accessPoint, boolean edit) {
mConfigUi = parent;
mInXlSetupWizard = (parent instanceof WifiConfigUiForSetupWizardXL);
mView = view;
mAccessPoint = accessPoint;
@@ -474,6 +478,13 @@ public class WifiConfigController implements TextWatcher,
if (mAccessPointSecurity == AccessPoint.SECURITY_NONE) {
mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
return;
} else if (mAccessPointSecurity == AccessPoint.SECURITY_EAP && mInXlSetupWizard) {
// In SetupWizard for XLarge screen, we don't have enough space for showing
// configurations needed for EAP. We instead disable the whole feature there and let
// users configure those networks after the setup.
mView.findViewById(R.id.eap_not_supported).setVisibility(View.VISIBLE);
mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
return;
}
mView.findViewById(R.id.security_fields).setVisibility(View.VISIBLE);