Allow QS to launch adding network dialog
This allows QS to set an extra that will launch the adding network dialog directly for a specified ssid. It will be used to take users straight from QS to the password entry, when a secure network is selected. Bug: 17722817 Change-Id: I570596af906de005c505678b539f915c06e6fd14
This commit is contained in:
@@ -145,6 +145,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;
|
||||||
@@ -326,6 +329,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
|
||||||
|
Reference in New Issue
Block a user