diff options
| author | 2022-08-29 03:46:51 +0000 | |
|---|---|---|
| committer | 2022-08-29 03:46:51 +0000 | |
| commit | f2826d867b50a897dd1b34b5950660a90171b160 (patch) | |
| tree | e8a076b51f95e933aedfa5c0e81b972397ba15fd | |
| parent | 0ff178f973ac0464b77dcf75791abd46ef42b9cd (diff) | |
| parent | e2900a6db679c8c820ab923cccfb4d8569563d96 (diff) | |
Merge "[Panlingual] Removed the feature flag of per app language." into tm-qpr-dev
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 4b8c8554bdd2..e0e41d07d973 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -52,12 +52,6 @@ public class FeatureFlagUtils { 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 */ @@ -110,7 +104,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true"); 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"); @@ -121,7 +114,6 @@ public class FeatureFlagUtils { private static final Set<String> PERSISTENT_FLAGS; 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); |