[Provider Model] Add Wi-Fi toggle
- Network & internet Settings
- Remove “Show airplane mode networks"
- Internet Settings
- Add “Wi-Fi” switch preference
- Show “Find and connect to Wi-Fi networks” in summary
- Screenshot:
https://screenshot.googleplex.com/AnoXf4qDe2jPirP
Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
This commit is contained in:
@@ -196,6 +196,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
private PreferenceCategory mWifiEntryPreferenceCategory;
|
||||
@VisibleForTesting
|
||||
AddWifiNetworkPreference mAddWifiNetworkPreference;
|
||||
private WifiSwitchPreferenceController mWifiSwitchPreferenceController;
|
||||
@VisibleForTesting
|
||||
Preference mConfigureWifiSettingsPreference;
|
||||
@VisibleForTesting
|
||||
@@ -270,6 +271,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
addNetworkMobileProviderController();
|
||||
addViewAirplaneModeNetworksButtonController();
|
||||
addConnectedEthernetNetworkController();
|
||||
addWifiSwitchPreferenceController();
|
||||
}
|
||||
|
||||
private void addNetworkMobileProviderController() {
|
||||
@@ -298,6 +300,14 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
mConnectedEthernetNetworkController.displayPreference(getPreferenceScreen());
|
||||
}
|
||||
|
||||
private void addWifiSwitchPreferenceController() {
|
||||
if (mWifiSwitchPreferenceController == null) {
|
||||
mWifiSwitchPreferenceController =
|
||||
new WifiSwitchPreferenceController(getContext(), getSettingsLifecycle());
|
||||
}
|
||||
mWifiSwitchPreferenceController.displayPreference(getPreferenceScreen());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityCreated(Bundle savedInstanceState) {
|
||||
super.onActivityCreated(savedInstanceState);
|
||||
|
||||
Reference in New Issue
Block a user