diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-03-06 18:34:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-06 18:34:35 +0000 |
| commit | 56ff8c44a529664d0d02fd692fe3612c025ac681 (patch) | |
| tree | cd643de6ccf517a469743f9ee8dd2c12cd637cd4 /core/java/android/util | |
| parent | 4d8cabe411c347952e0c9546401fd2507a296b63 (diff) | |
| parent | 9b87a44b79918b4608d02fac04eed5442cd18dda (diff) | |
Merge ""Global Actions Panel" plugin"
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index fac699ece642..b99336bb0dbf 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -39,6 +39,8 @@ public class FeatureFlagUtils { 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 GLOBAL_ACTIONS_PANEL_ENABLED = + "settings_global_actions_panel_enabled"; private static final Map<String, String> DEFAULT_FLAGS; @@ -56,7 +58,8 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); DEFAULT_FLAGS.put(SAFETY_HUB, "false"); DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false"); - DEFAULT_FLAGS.put(GLOBAL_ACTIONS_GRID_ENABLED, "false"); + DEFAULT_FLAGS.put(GLOBAL_ACTIONS_GRID_ENABLED, "true"); + DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true"); } /** |