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

[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2

Browse Source 
Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
This commit is contained in:
Zoey Chen
2021-11-15 21:59:46 +08:00
parent 5515e9bde5
commit 439bc7f9dd
6 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,20 +60,13 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
if (Utils.isProviderModelEnabled(getContext())) {
return R.xml.network_provider_internet;
} else {
return R.xml.network_and_internet;
}
return R.xml.network_provider_internet;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (!Utils.isProviderModelEnabled(context)) {
use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
}
use(AirplaneModePreferenceController.class).setFragment(this);
getSettingsLifecycle().addObserver(use(AllInOneTetherPreferenceController.class));
}
@@ -100,16 +93,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
MobilePlanPreferenceHost mobilePlanHost) {
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, mobilePlanHost);
final WifiPrimarySwitchPreferenceController wifiPreferenceController =
Utils.isProviderModelEnabled(context)
? null
: new WifiPrimarySwitchPreferenceController(
context,
metricsFeatureProvider);
final InternetPreferenceController internetPreferenceController =
Utils.isProviderModelEnabled(context)
? new InternetPreferenceController(context, lifecycle)
: null;
new InternetPreferenceController(context, lifecycle);
final VpnPreferenceController vpnPreferenceController =
new VpnPreferenceController(context);
@@ -118,9 +103,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
if (lifecycle != null) {
lifecycle.addObserver(mobilePlanPreferenceController);
if (wifiPreferenceController != null) {
lifecycle.addObserver(wifiPreferenceController);
}
lifecycle.addObserver(vpnPreferenceController);
lifecycle.addObserver(privateDnsPreferenceController);
}
@@ -132,9 +114,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(vpnPreferenceController);
controllers.add(new ProxyPreferenceController(context));
controllers.add(mobilePlanPreferenceController);
if (wifiPreferenceController != null) {
controllers.add(wifiPreferenceController);
}
if (internetPreferenceController != null) {
controllers.add(internetPreferenceController);
}