Merge "Clean Safetyhub feature flag." into qt-dev

am: fe77152334

Change-Id: Ib36a78df4cca4e61ad93fd8d759ca6cdf993b4ab
This commit is contained in:
yuanjiahsu
2019-05-02 16:19:24 -07:00
committed by android-build-merger

View File

@@ -36,7 +36,6 @@ public class FeatureFlagUtils {
public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;
public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";
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 FORCE_GLOBAL_ACTIONS_GRID_ENABLED =
"settings_global_actions_force_grid_enabled";
@@ -57,7 +56,6 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false");
DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");
DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");
DEFAULT_FLAGS.put(SAFETY_HUB, "true");
DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");
DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false");
DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true");