Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev am: 240b227e1f

am: 34fa757cc9

Change-Id: I01aa071f1ce7f59aa160b7e53baf9da2d2a7db95
This commit is contained in:
Mady Mellor
2019-05-13 11:59:52 -07:00
committed by android-build-merger
18 changed files with 268 additions and 544 deletions

View File

@@ -498,6 +498,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new DesktopModePreferenceController(context));
controllers.add(new DeviceIdentifierAccessRestrictionsPreferenceController(context));
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
controllers.add(new BubbleGlobalPreferenceController(context));
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));