diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-03 22:36:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-03 22:36:29 +0000 |
| commit | 2ae133285bb88eb91c3b1fa7cc123aa2d7bf7d05 (patch) | |
| tree | d2810cf764f936259dce0dbdaa70413ee8edd94e /core/java/android/util/FeatureFlagUtils.java | |
| parent | 7df27e9e4e9193eab12626379d0bd6c1a8c1affd (diff) | |
| parent | c7926618407a92a4ed9a502e40f243dfa62d8847 (diff) | |
Merge "Fix Global Actions animations, and use old power menu when panel is disabled. Also tweak feature flags setup to use old flag as a force option for debugging."
Diffstat (limited to 'core/java/android/util/FeatureFlagUtils.java')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 5d33b49e181b..336c2e51c4a3 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -38,7 +38,8 @@ public class FeatureFlagUtils { public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; public static final String SAFETY_HUB = "settings_safety_hub"; public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press"; - public static final String GLOBAL_ACTIONS_GRID_ENABLED = "settings_global_actions_grid_enabled"; + public static final String FORCE_GLOBAL_ACTIONS_GRID_ENABLED = + "settings_global_actions_force_grid_enabled"; public static final String GLOBAL_ACTIONS_PANEL_ENABLED = "settings_global_actions_panel_enabled"; public static final String DYNAMIC_SYSTEM = "settings_dynamic_system"; @@ -58,7 +59,7 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); DEFAULT_FLAGS.put(SAFETY_HUB, "true"); DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false"); - DEFAULT_FLAGS.put(GLOBAL_ACTIONS_GRID_ENABLED, "true"); + DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false"); DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true"); DEFAULT_FLAGS.put("settings_wifi_details_saved_screen", "true"); DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false"); |