Merge "Create a feature flag for Clear Calling" into tm-qpr-dev am: 9c04c0ada9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911004

Change-Id: I61616829d188fc0092c3e63c479c96c9fd86db51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Binyi Wu
2022-07-22 00:49:40 +00:00
committed by Automerger Merge Worker

View File

@@ -88,6 +88,11 @@ public class FeatureFlagUtils {
*/ */
public static final String SETTINGS_GUEST_MODE_UX_CHANGES = "settings_guest_mode_ux_changes"; public static final String SETTINGS_GUEST_MODE_UX_CHANGES = "settings_guest_mode_ux_changes";
/** Support Clear Calling feature.
* @hide
*/
public static final String SETTINGS_ENABLE_CLEAR_CALLING = "settings_enable_clear_calling";
private static final Map<String, String> DEFAULT_FLAGS; private static final Map<String, String> DEFAULT_FLAGS;
static { static {
@@ -116,6 +121,7 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true"); DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true");
DEFAULT_FLAGS.put(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE, "true"); DEFAULT_FLAGS.put(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE, "true");
DEFAULT_FLAGS.put(SETTINGS_GUEST_MODE_UX_CHANGES, "true"); DEFAULT_FLAGS.put(SETTINGS_GUEST_MODE_UX_CHANGES, "true");
DEFAULT_FLAGS.put(SETTINGS_ENABLE_CLEAR_CALLING, "false");
} }
private static final Set<String> PERSISTENT_FLAGS; private static final Set<String> PERSISTENT_FLAGS;