Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-18 07:15:50 +00:00
committed by Android (Google) Code Review
parent db888014dc 1f6c1537d4
commit ed8dd882dc
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/util/FeatureFlagUtils.java
View File

@@ -51,6 +51,9 @@ public class FeatureFlagUtils {
/** @hide */ /** @hide */
public static final String SETTINGS_ENABLE_SECURITY_HUB = "settings_enable_security_hub"; 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; private static final Map<String, String> DEFAULT_FLAGS;
static { static {
@@ -72,12 +75,14 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "true"); DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "true");
DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "true"); DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "true");
DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true"); DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true");
DEFAULT_FLAGS.put(SETTINGS_SUPPORT_LARGE_SCREEN, "false");
} }
private static final Set<String> PERSISTENT_FLAGS; private static final Set<String> PERSISTENT_FLAGS;
static { static {
PERSISTENT_FLAGS = new HashSet<>(); PERSISTENT_FLAGS = new HashSet<>();
PERSISTENT_FLAGS.add(SETTINGS_PROVIDER_MODEL); PERSISTENT_FLAGS.add(SETTINGS_PROVIDER_MODEL);
PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);
} }
/** /**