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

[Provider Model] Add Internet preference to replace Wi-Fi preference

Browse Source 
- Change title from "Wi-Fi" to "Internet"
- Remove Wi-Fi switch
- Screenshot:
  https://screenshot.googleplex.com/9tmXYQXKSsuGwEY
  https://screenshot.googleplex.com/5uMCeruXsX3gP9j

Bug: 172295984
Test: manual test
  atest -c InternetPreferenceControllerTest
  make RunSettingsRoboTests ROBOTEST_FILTER=NetworkDashboardFragmentTest
Change-Id: Ie4a3c9aff45fbe7b28594afc9c603e6df57300bf
This commit is contained in:
Weng Su
2020-11-15 19:40:55 +00:00
parent 425dbba58e
commit f0b9dc570b
7 changed files with 233 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -104,7 +104,13 @@ public class NetworkDashboardFragment extends DashboardFragment implements
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, mobilePlanHost);
final WifiPrimarySwitchPreferenceController wifiPreferenceController =
new WifiPrimarySwitchPreferenceController(context, metricsFeatureProvider);
isProviderModelEnabled(context)
? null
: new WifiPrimarySwitchPreferenceController(
context,
metricsFeatureProvider);
final InternetPreferenceController internetPreferenceController =
isProviderModelEnabled(context) ? new InternetPreferenceController(context) : null;
final VpnPreferenceController vpnPreferenceController =
new VpnPreferenceController(context);
@@ -113,7 +119,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
if (lifecycle != null) {
lifecycle.addObserver(mobilePlanPreferenceController);
lifecycle.addObserver(wifiPreferenceController);
if (wifiPreferenceController != null) {
lifecycle.addObserver(wifiPreferenceController);
}
if (internetPreferenceController != null) {
lifecycle.addObserver(internetPreferenceController);
}
lifecycle.addObserver(vpnPreferenceController);
lifecycle.addObserver(privateDnsPreferenceController);
}
@@ -125,7 +136,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(vpnPreferenceController);
controllers.add(new ProxyPreferenceController(context));
controllers.add(mobilePlanPreferenceController);
controllers.add(wifiPreferenceController);
if (wifiPreferenceController != null) {
controllers.add(wifiPreferenceController);
}
if (internetPreferenceController != null) {
controllers.add(internetPreferenceController);
}
controllers.add(privateDnsPreferenceController);
return controllers;
}