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

Commit a41f8c80 authored by Daniel Huang's avatar Daniel Huang Committed by Android (Google) Code Review
Browse files

Merge "Remove flag SETTINGS_NEW_KEYBOARD_SHORTCUT"

parents 62f59cbc 00959482

core/java/android/util/FeatureFlagUtils.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -95,12 +95,6 @@ public class FeatureFlagUtils { 
     */

     */

    public static final String SETTINGS_NEW_KEYBOARD_UI = "settings_new_keyboard_ui";

    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

     * Enable new modifier key settings UI

     * @hide

     * @hide
@@ -227,7 +221,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, "true");

        DEFAULT_FLAGS.put(SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, "true");

        DEFAULT_FLAGS.put(SETTINGS_AUTO_TEXT_WRAPPING, "false");

        DEFAULT_FLAGS.put(SETTINGS_AUTO_TEXT_WRAPPING, "false");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_UI, "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_MODIFIER_KEY, "false");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD, "false");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD, "false");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE, "false");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE, "false");
@@ -255,7 +248,6 @@ public class FeatureFlagUtils { 
        PERSISTENT_FLAGS.add(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME);

        PERSISTENT_FLAGS.add(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME);

        PERSISTENT_FLAGS.add(SETTINGS_AUTO_TEXT_WRAPPING);

        PERSISTENT_FLAGS.add(SETTINGS_AUTO_TEXT_WRAPPING);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_UI);

        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_MODIFIER_KEY);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);