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

am ca063736: Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6 automerge: 3caba72

Browse Source 
* commit 'ca063736e98decbf14d876dd90689d02cb18eaa2':
  Allow QS to launch adding network dialog
This commit is contained in:
Jason Monk
2014-10-28 19:44:28 +00:00
committed by Android Git Automerger
parent 5e62773362 ca063736e9
commit d920bd0819
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,9 @@ public class WifiSettings extends RestrictedSettingsFragment
// this boolean extra specifies whether to disable the Next button when not connected. Used by // this boolean extra specifies whether to disable the Next button when not connected. Used by
// account creation outside of setup wizard. // account creation outside of setup wizard.
private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect"; private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
// This string extra specifies a network to open the connect dialog on, so the user can enter
// network credentials. This is used by quick settings for secured networks.
private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
// should Next button only be enabled when we have a connection? // should Next button only be enabled when we have a connection?
private boolean mEnableNextOnConnection; private boolean mEnableNextOnConnection;
@@ -329,6 +332,23 @@ public class WifiSettings extends RestrictedSettingsFragment
mEmptyView = initEmptyView(); mEmptyView = initEmptyView();
registerForContextMenu(getListView()); registerForContextMenu(getListView());
setHasOptionsMenu(true); setHasOptionsMenu(true);
if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
String ssid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
updateAccessPoints();
PreferenceScreen preferenceScreen = getPreferenceScreen();
for (int i = 0; i < preferenceScreen.getPreferenceCount(); i++) {
Preference preference = preferenceScreen.getPreference(i);
if (preference instanceof AccessPoint) {
AccessPoint accessPoint = (AccessPoint) preference;
if (ssid.equals(accessPoint.ssid) && accessPoint.networkId == -1
&& accessPoint.security != AccessPoint.SECURITY_NONE) {
onPreferenceTreeClick(preferenceScreen, preference);
break;
}
}
}
}
} }
@Override @Override