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

Commit ae601be1 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "[Panlingual] Removed the feature flag of per app language."

parents 31856cd5 08496836

core/java/android/util/FeatureFlagUtils.java

+0 −9
Original line number Diff line number Diff line
@@ -51,13 +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";





    /**

     * Feature flag to allow/restrict intent redirection from/to clone profile.

     * Default value is false,this is to ensure that framework is not impacted by intent redirection
@@ -139,7 +132,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_ALLOW_INTENT_REDIRECTION_FOR_CLONE_PROFILE, "false");

        DEFAULT_FLAGS.put(SETTINGS_APP_LOCALE_OPT_IN_ENABLED, "true");

        DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "true");
@@ -154,7 +146,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_ALLOW_INTENT_REDIRECTION_FOR_CLONE_PROFILE);

        PERSISTENT_FLAGS.add(SETTINGS_APP_LOCALE_OPT_IN_ENABLED);

        PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);