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

Merge "Refactor airplane mode preference controller." into pi-dev am: 0375bbc709

Browse Source 
am: 3d3e2609bc

Change-Id: I5e681d39a118bd88915815e4a27b561b57425171
This commit is contained in:
CY Cheng
2018-04-12 13:40:34 -07:00
committed by android-build-merger
parent bcb5bdf06c 3d3e2609bc
commit f7e01e1294
5 changed files with 158 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
public void onAttach(Context context) {
super.onAttach(context);
mNetworkResetController = new NetworkResetActionMenuController(context, MENU_NETWORK_RESET);
use(AirplaneModePreferenceController.class).setFragment(this);
}
@Override
@@ -96,8 +98,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, MetricsFeatureProvider metricsFeatureProvider, Fragment fragment,
MobilePlanPreferenceHost mobilePlanHost) {
final AirplaneModePreferenceController airplaneModePreferenceController =
new AirplaneModePreferenceController(context, fragment);
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, mobilePlanHost);
final WifiMasterSwitchPreferenceController wifiPreferenceController =
@@ -110,7 +110,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
new PrivateDnsPreferenceController(context);
if (lifecycle != null) {
lifecycle.addObserver(airplaneModePreferenceController);
lifecycle.addObserver(mobilePlanPreferenceController);
lifecycle.addObserver(wifiPreferenceController);
lifecycle.addObserver(mobileNetworkPreferenceController);
@@ -119,7 +118,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
}
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(airplaneModePreferenceController);
controllers.add(mobileNetworkPreferenceController);
controllers.add(new TetherPreferenceController(context, lifecycle));
controllers.add(vpnPreferenceController);