summaryrefslogtreecommitdiff
path: root/core/java/android/util/FeatureFlagUtils.java
diff options
context:
space:
mode:
authorAran Ink <nesciosquid@google.com>2019-05-10 15:27:36 -0400
committerAran Ink <nesciosquid@google.com>2019-05-14 14:31:07 +0000
commitf4744c686f9cfec9d3ecd0f879ef87e0f8149e91 (patch)
tree40ea0439e4debb97ce7841f2843922e12ed16bf4 /core/java/android/util/FeatureFlagUtils.java
parent0ef7b0d46ef8cf5d80e1d042cfdf1f1fae17c40a (diff)
Remove GlobalActionsDialog values from FeatureFlagUtils.
Merged-in: I5ca5e760d9a987c75a93c43783ad2b38728d48fc Test: Automated tests pass. Manual testing shows GAD still works. Fixes: 123397865 Fixes: 127644235 Change-Id: I0a8e285c96eea566ed1b19fa05e4143324f5937b
Diffstat (limited to 'core/java/android/util/FeatureFlagUtils.java')
-rw-r--r--core/java/android/util/FeatureFlagUtils.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index ae36e4ecde17..c42dc817bec4 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -37,10 +37,6 @@ public class FeatureFlagUtils {
public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";
public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";
- 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 PIXEL_WALLPAPER_CATEGORY_SWITCH =
"settings_pixel_wallpaper_category_switch";
public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";
@@ -57,8 +53,6 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");
DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");
DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");
- DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false");
- DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true");
DEFAULT_FLAGS.put(PIXEL_WALLPAPER_CATEGORY_SWITCH, "false");
DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false");
}