Merge "Remove the old battery page" into pi-dev am: 4e25277f60

am: 71333cb477

Change-Id: I166c6de0bd2a7150dbfbbe35783c2fab86c6ed45
This commit is contained in:
Lei Yu
2018-03-27 22:46:44 +00:00
committed by android-build-merger
18 changed files with 1 additions and 2564 deletions

View File

@@ -449,8 +449,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
controllers.add(
new DefaultLaunchPreferenceController(context, "android_o_battery_settings"));
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
controllers.add(new DefaultLaunchPreferenceController(context, "feature_flags_dashboard"));