summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author danielwbhuang <danielwbhuang@google.com> 2022-10-28 15:32:13 +0800
committer danielwbhuang <danielwbhuang@google.com> 2022-10-28 15:32:13 +0800
commite4fadcbaec4197204e1f89ef7c9cb989b6afaa89 (patch)
tree137d58b500c2583afcd6a1e501836dd4823bcdad
parent16545e1ccbe23f3d7b4a7cc57c9c6deb672baedc (diff)
Create feature flags to control new shortcut, modifier keys and trackpad settings.
Bug: 256087727 Test: local test Change-Id: I08277c4934295520fc650f6ebe7dfd860e05f2ec
-rw-r--r--core/java/android/util/FeatureFlagUtils.java25
1 files changed, 25 insertions, 0 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index d1f05ec0c05e..7b6a6d29baf8 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -103,6 +103,25 @@ public class FeatureFlagUtils {
public static final String SETTINGS_NEW_KEYBOARD_UI = "settings_new_keyboard_ui";
/**
+ * Enable new shortcut list UI
+ * @hide
+ */
+ public static final String SETTINGS_NEW_KEYBOARD_SHORTCUT = "settings_new_keyboard_shortcut";
+
+ /**
+ * Enable new modifier key settings UI
+ * @hide
+ */
+ public static final String SETTINGS_NEW_KEYBOARD_MODIFIER_KEY =
+ "settings_new_keyboard_modifier_key";
+
+ /**
+ * Enable new trackpad settings UI
+ * @hide
+ */
+ public static final String SETTINGS_NEW_KEYBOARD_TRACKPAD = "settings_new_keyboard_trackpad";
+
+ /**
* Enable the new pages which is implemented with SPA.
* @hide
*/
@@ -143,6 +162,9 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE, "true");
DEFAULT_FLAGS.put(SETTINGS_AUTO_TEXT_WRAPPING, "false");
DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_UI, "false");
+ DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_SHORTCUT, "false");
+ DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_MODIFIER_KEY, "false");
+ DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD, "false");
DEFAULT_FLAGS.put(SETTINGS_ENABLE_SPA, "false");
DEFAULT_FLAGS.put(SETTINGS_ADB_METRICS_WRITER, "false");
}
@@ -158,6 +180,9 @@ public class FeatureFlagUtils {
PERSISTENT_FLAGS.add(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE);
PERSISTENT_FLAGS.add(SETTINGS_AUTO_TEXT_WRAPPING);
PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_UI);
+ PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_SHORTCUT);
+ PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_MODIFIER_KEY);
+ PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD);
}
/**