Merge "Create a feature flag for Clear Calling" into tm-qpr-dev (9c04c0ad) · Commits · e / os / android_frameworks_base

core/java/android/util/FeatureFlagUtils.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;