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

Commit 2a084036 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a feature flag to guard the large screen feature in Settings app."... 

Merge "Add a feature flag to guard the large screen feature in Settings app." into sc-v2-dev am: ed8dd882

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

Change-Id: Iba4a28b14e0dd02a0f823a03bfa419805b091cc1
parents 48478699 ed8dd882

core/java/android/util/FeatureFlagUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ public class FeatureFlagUtils { 
    /** @hide */

    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";



    private static final Map<String, String> DEFAULT_FLAGS;



    static {
@@ -72,12 +75,14 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "true");

        DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "true");

        DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true");

        DEFAULT_FLAGS.put(SETTINGS_SUPPORT_LARGE_SCREEN, "false");

    }



    private static final Set<String> PERSISTENT_FLAGS;

    static {

        PERSISTENT_FLAGS = new HashSet<>();

        PERSISTENT_FLAGS.add(SETTINGS_PROVIDER_MODEL);

        PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);

    }



    /**