Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev (aaf91230) · Commits · e / os / android_frameworks_base

core/java/android/util/FeatureFlagUtils.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -50,12 +50,21 @@ public class FeatureFlagUtils {
		public static final String SETTINGS_ENABLE_SECURITY_HUB = "settings_enable_security_hub";
		/** @hide */
		public static final String SETTINGS_SUPPORT_LARGE_SCREEN = "settings_support_large_screen";

		/**
		* Support per app's language selection
		* @hide
		*/
		public static final String SETTINGS_APP_LANGUAGE_SELECTION = "settings_app_language_selection";

		/**
		* Support locale opt-out and opt-in switch for per app's language.
		* @hide
		*/
		public static final String SETTINGS_APP_LOCALE_OPT_IN_ENABLED =
		"settings_app_locale_opt_in_enabled";


		/** @hide */
		public static final String SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS =
		"settings_enable_monitor_phantom_procs";
		@@ -97,6 +106,7 @@ public class FeatureFlagUtils {
		DEFAULT_FLAGS.put(SETTINGS_SUPPORT_LARGE_SCREEN, "true");
		DEFAULT_FLAGS.put("settings_search_always_expand", "true");
		DEFAULT_FLAGS.put(SETTINGS_APP_LANGUAGE_SELECTION, "true");
		DEFAULT_FLAGS.put(SETTINGS_APP_LOCALE_OPT_IN_ENABLED, "true");
		DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "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");
		@@ -106,6 +116,7 @@ public class FeatureFlagUtils {
		static {
		PERSISTENT_FLAGS = new HashSet<>();
		PERSISTENT_FLAGS.add(SETTINGS_APP_LANGUAGE_SELECTION);
		PERSISTENT_FLAGS.add(SETTINGS_APP_LOCALE_OPT_IN_ENABLED);
		PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);
		PERSISTENT_FLAGS.add(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS);
		PERSISTENT_FLAGS.add(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME);