From e5ac395ac3d282ea0eeabed123d0c9ddf906aa95 Mon Sep 17 00:00:00 2001 From: Yilin Cai Date: Thu, 9 Feb 2023 15:59:55 +0800 Subject: [PATCH] Add a flag to guard next phase SPA migration in Settings app. Test: make SettingsGoogle Bug: 268443971 Change-Id: I789c95701d8a7f29e4dc06c1ddcbcc91f3c08c93 --- core/java/android/util/FeatureFlagUtils.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index ba9847eb46316..0ab01e42b2a73 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -127,6 +127,13 @@ public class FeatureFlagUtils { */ public static final String SETTINGS_ENABLE_SPA = "settings_enable_spa"; + /** + * Enable new pages implemented with SPA besides the SPA pages controlled by the {@code + * settings_enable_spa} flag. + * @hide + */ + public static final String SETTINGS_ENABLE_SPA_PHASE2 = "settings_enable_spa_phase2"; + /** Flag to enable/disable adb log metrics * @hide */ @@ -217,6 +224,7 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD, "false"); DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE, "false"); DEFAULT_FLAGS.put(SETTINGS_ENABLE_SPA, "true"); + DEFAULT_FLAGS.put(SETTINGS_ENABLE_SPA_PHASE2, "false"); DEFAULT_FLAGS.put(SETTINGS_ADB_METRICS_WRITER, "false"); DEFAULT_FLAGS.put(SETTINGS_SHOW_STYLUS_PREFERENCES, "true"); DEFAULT_FLAGS.put(SETTINGS_BIOMETRICS2_ENROLLMENT, "false"); @@ -243,6 +251,7 @@ public class FeatureFlagUtils { PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD); PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); PERSISTENT_FLAGS.add(SETTINGS_ENABLE_SPA); + PERSISTENT_FLAGS.add(SETTINGS_ENABLE_SPA_PHASE2); PERSISTENT_FLAGS.add(SETTINGS_PREFER_ACCESSIBILITY_MENU_IN_SYSTEM); }