diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-18 07:47:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-18 07:47:05 +0000 |
| commit | 2f9639e0fdd416c0bbc84af720918bc5205db3c4 (patch) | |
| tree | 8c12e6573fe7251a97496b29928d4334f9d78ff8 /core/java/android/util | |
| parent | 1c5cbd49a1a98b1b39e71ebd536ca9ce357c110b (diff) | |
| parent | 2a084036e021bd78a411e0ca6eb7b41fddd06019 (diff) | |
Merge "Add a feature flag to guard the large screen feature in Settings app." into sc-v2-dev am: ed8dd882dc am: 2a084036e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15595470
Change-Id: Id1ca3957b886a19fbf934c6c595cd63476f05069
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 6c3c38359957..3d39fbeea7d8 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -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); } /** |