Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 618192c7 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Panlingual] Removed the feature flag of per app language." into tm-qpr-dev am: f2826d86 

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



Change-Id: I314ed0eac14c991ad32c2d48a19fe1cb4464192d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 826bdca9 f2826d86

core/java/android/util/FeatureFlagUtils.java

+0 −8
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ public class FeatureFlagUtils { 
    /** @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
@@ -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);