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

Commit b96025b2 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Physical Keyboard Setting] Delete obsolete flag" into main

parents 411b67e8 d4c404d7

core/java/android/util/FeatureFlagUtils.java

+0 −8
Original line number Diff line number Diff line
@@ -86,12 +86,6 @@ public class FeatureFlagUtils { 
    public static final String SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST =

            "settings_need_connected_ble_device_for_broadcast";



    /**

     * Enable new language and keyboard settings UI

     * @hide

     */

    public static final String SETTINGS_NEW_KEYBOARD_UI = "settings_new_keyboard_ui";



    /**

     * Enable new modifier key settings UI

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

        DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true");

        DEFAULT_FLAGS.put(SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, "true");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_UI, "true");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_MODIFIER_KEY, "true");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD, "true");

        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE, "false");
@@ -249,7 +242,6 @@ public class FeatureFlagUtils { 
        PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);

        PERSISTENT_FLAGS.add(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS);

        PERSISTENT_FLAGS.add(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_UI);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_MODIFIER_KEY);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD);

        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);