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

Merge "Show password field when authentication failed." into honeycomb

Browse Source
This commit is contained in:
Daisuke Miyakawa
2011-01-12 11:02:04 -08:00
committed by Android (Google) Code Review
parent eaf3d4c95d cde3083fb5
commit 4f0cd58e86
3 changed files with 134 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -446,6 +446,10 @@ public class WifiSettings extends SettingsPreferenceFragment
updateConnectionState(WifiInfo.getDetailedStateOf((SupplicantState)
intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)));
}
if (mInXlSetupWizard) {
((WifiSettingsForSetupWizardXL)getActivity()).onSupplicantStateChanged(intent);
}
} else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
WifiManager.EXTRA_NETWORK_INFO);
@@ -589,11 +593,11 @@ public class WifiSettings extends SettingsPreferenceFragment
}
} else if (config.networkId != INVALID_NETWORK_ID) {
if (mSelectedAccessPoint != null) {
mWifiManager.saveNetwork(config);
saveNetwork(config);
}
} else {
if (configController.isEdit() || requireKeyStore(config)) {
mWifiManager.saveNetwork(config);
saveNetwork(config);
} else {
mWifiManager.connectNetwork(config);
}
@@ -607,6 +611,14 @@ public class WifiSettings extends SettingsPreferenceFragment
updateAccessPoints();
}
private void saveNetwork(WifiConfiguration config) {
if (mInXlSetupWizard) {
((WifiSettingsForSetupWizardXL)getActivity()).onSaveNetwork(config);
} else {
mWifiManager.saveNetwork(config);
}
}
/* package */ void forget() {
mWifiManager.forgetNetwork(mSelectedAccessPoint.networkId);