diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-05-06 15:40:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-06 15:40:30 +0000 |
| commit | f22ab3d69b6e837fecf5de1ab4a85ca6b3bbcc57 (patch) | |
| tree | 5fefec55eda4e9ff8dd4a9708f7031145e7ef784 /core/java/android/util/FeatureFlagUtils.java | |
| parent | ba0300d6b6d88c30e9198d6207de999760600df5 (diff) | |
| parent | 4219739b2b083abb9d25f6e0b43bd8810918a4cd (diff) | |
Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev am: aaf912305b am: 4219739b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161842
Change-Id: If9a7264ad2373f9acb9e67cb7ef2ed20e516620b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android/util/FeatureFlagUtils.java')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 9a9e6a2a7ab9..6049199fc217 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -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"; @@ -102,6 +111,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"); @@ -112,6 +122,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); |