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

Commit f613291d authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Flag cleanup: keyboard_a11y_(bounce/slow/sticky)_keys_flag 

Bug: 294546335
Test: manual
Flag: EXEMPT cleanup
Change-Id: Iffba0c67ed626d517a105441deff3d9fb97fdf3b
parent 0bf31420

core/api/test-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -1798,17 +1798,17 @@ package android.hardware.input { 
  }



  public class InputSettings {

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_bounce_keys_flag") public static int getAccessibilityBounceKeysThreshold(@NonNull android.content.Context);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_slow_keys_flag") public static int getAccessibilitySlowKeysThreshold(@NonNull android.content.Context);

    method public static int getAccessibilityBounceKeysThreshold(@NonNull android.content.Context);

    method public static int getAccessibilitySlowKeysThreshold(@NonNull android.content.Context);

    method @FlaggedApi("com.android.input.flags.keyboard_repeat_keys") public static int getRepeatKeysDelay(@NonNull android.content.Context);

    method @FlaggedApi("com.android.input.flags.keyboard_repeat_keys") public static int getRepeatKeysTimeout(@NonNull android.content.Context);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_mouse_keys") public static boolean isAccessibilityMouseKeysEnabled(@NonNull android.content.Context);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_sticky_keys_flag") public static boolean isAccessibilityStickyKeysEnabled(@NonNull android.content.Context);

    method public static boolean isAccessibilityStickyKeysEnabled(@NonNull android.content.Context);

    method @FlaggedApi("com.android.input.flags.keyboard_repeat_keys") public static boolean isRepeatKeysEnabled(@NonNull android.content.Context);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_bounce_keys_flag") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityBounceKeysThreshold(@NonNull android.content.Context, int);

    method @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityBounceKeysThreshold(@NonNull android.content.Context, int);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_mouse_keys") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityMouseKeysEnabled(@NonNull android.content.Context, boolean);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_slow_keys_flag") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilitySlowKeysThreshold(@NonNull android.content.Context, int);

    method @FlaggedApi("com.android.hardware.input.keyboard_a11y_sticky_keys_flag") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityStickyKeysEnabled(@NonNull android.content.Context, boolean);

    method @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilitySlowKeysThreshold(@NonNull android.content.Context, int);

    method @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityStickyKeysEnabled(@NonNull android.content.Context, boolean);

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void setMaximumObscuringOpacityForTouch(@NonNull android.content.Context, @FloatRange(from=0, to=1) float);

    method @FlaggedApi("com.android.input.flags.keyboard_repeat_keys") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setRepeatKeysDelay(@NonNull android.content.Context, int);

    method @FlaggedApi("com.android.input.flags.keyboard_repeat_keys") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setRepeatKeysEnabled(@NonNull android.content.Context, boolean);

core/java/android/hardware/input/InputManager.java

+0 −6
Original line number Diff line number Diff line
@@ -1399,9 +1399,6 @@ public final class InputManager { 
    @RequiresPermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE)

    public void registerStickyModifierStateListener(@NonNull Executor executor,

            @NonNull StickyModifierStateListener listener) throws IllegalArgumentException {

        if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {

            return;

        }

        mGlobal.registerStickyModifierStateListener(executor, listener);

    }
@@ -1415,9 +1412,6 @@ public final class InputManager { 
    @RequiresPermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE)

    public void unregisterStickyModifierStateListener(

            @NonNull StickyModifierStateListener listener) {

        if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {

            return;

        }

        mGlobal.unregisterStickyModifierStateListener(listener);

    }

core/java/android/hardware/input/InputSettings.java

+0 −77
Original line number Diff line number Diff line
@@ -16,15 +16,9 @@ 


package android.hardware.input;



import static com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_BOUNCE_KEYS_FLAG;

import static com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_MOUSE_KEYS;

import static com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_SLOW_KEYS_FLAG;

import static com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG;

import static com.android.hardware.input.Flags.enableCustomizableInputGestures;

import static com.android.hardware.input.Flags.keyboardA11yBounceKeysFlag;

import static com.android.hardware.input.Flags.keyboardA11yMouseKeys;

import static com.android.hardware.input.Flags.keyboardA11ySlowKeysFlag;

import static com.android.hardware.input.Flags.keyboardA11yStickyKeysFlag;

import static com.android.hardware.input.Flags.mouseScrollingAcceleration;

import static com.android.hardware.input.Flags.mouseReverseVerticalScrolling;

import static com.android.hardware.input.Flags.mouseSwapPrimaryButton;
@@ -870,21 +864,6 @@ public class InputSettings { 
                UserHandle.USER_CURRENT);

    }



    /**

     * Whether Accessibility bounce keys feature is enabled.

     *

     * <p>

     * Bounce keys’ is an accessibility feature to aid users who have physical disabilities,

     * that allows the user to configure the device to ignore rapid, repeated keypresses of the

     * same key.

     * </p>

     *

     * @hide

     */

    public static boolean isAccessibilityBounceKeysFeatureEnabled() {

        return keyboardA11yBounceKeysFlag();

    }



    /**

     * Whether Accessibility bounce keys is enabled.

     *
@@ -912,11 +891,7 @@ public class InputSettings { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_BOUNCE_KEYS_FLAG)

    public static int getAccessibilityBounceKeysThreshold(@NonNull Context context) {

        if (!isAccessibilityBounceKeysFeatureEnabled()) {

            return 0;

        }

        return Settings.Secure.getIntForUser(context.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS, 0, UserHandle.USER_CURRENT);

    }
@@ -936,13 +911,9 @@ public class InputSettings { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_BOUNCE_KEYS_FLAG)

    @RequiresPermission(Manifest.permission.WRITE_SETTINGS)

    public static void setAccessibilityBounceKeysThreshold(@NonNull Context context,

            int thresholdTimeMillis) {

        if (!isAccessibilityBounceKeysFeatureEnabled()) {

            return;

        }

        if (thresholdTimeMillis < 0

                || thresholdTimeMillis > MAX_ACCESSIBILITY_BOUNCE_KEYS_THRESHOLD_MILLIS) {

            throw new IllegalArgumentException(
@@ -954,21 +925,6 @@ public class InputSettings { 
                UserHandle.USER_CURRENT);

    }



    /**

     * Whether Accessibility slow keys feature flags is enabled.

     *

     * <p>

     * 'Slow keys' is an accessibility feature to aid users who have physical disabilities, that

     * allows the user to specify the duration for which one must press-and-hold a key before the

     * system accepts the keypress.

     * </p>

     *

     * @hide

     */

    public static boolean isAccessibilitySlowKeysFeatureFlagEnabled() {

        return keyboardA11ySlowKeysFlag();

    }



    /**

     * Whether Accessibility slow keys is enabled.

     *
@@ -996,11 +952,7 @@ public class InputSettings { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_SLOW_KEYS_FLAG)

    public static int getAccessibilitySlowKeysThreshold(@NonNull Context context) {

        if (!isAccessibilitySlowKeysFeatureFlagEnabled()) {

            return 0;

        }

        return Settings.Secure.getIntForUser(context.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_SLOW_KEYS, 0, UserHandle.USER_CURRENT);

    }
@@ -1020,13 +972,9 @@ public class InputSettings { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_SLOW_KEYS_FLAG)

    @RequiresPermission(Manifest.permission.WRITE_SETTINGS)

    public static void setAccessibilitySlowKeysThreshold(@NonNull Context context,

            int thresholdTimeMillis) {

        if (!isAccessibilitySlowKeysFeatureFlagEnabled()) {

            return;

        }

        if (thresholdTimeMillis < 0

                || thresholdTimeMillis > MAX_ACCESSIBILITY_SLOW_KEYS_THRESHOLD_MILLIS) {

            throw new IllegalArgumentException(
@@ -1038,23 +986,6 @@ public class InputSettings { 
                UserHandle.USER_CURRENT);

    }



    /**

     * Whether Accessibility sticky keys feature is enabled.

     *

     * <p>

     * 'Sticky keys' is an accessibility feature that assists users who have physical

     * disabilities or help users reduce repetitive strain injury. It serializes keystrokes

     * instead of pressing multiple keys at a time, allowing the user to press and release a

     * modifier key, such as Shift, Ctrl, Alt, or any other modifier key, and have it remain

     * active until any other key is pressed.

     * </p>

     *

     * @hide

     */

    public static boolean isAccessibilityStickyKeysFeatureEnabled() {

        return keyboardA11yStickyKeysFlag();

    }



    /**

     * Whether Accessibility sticky keys is enabled.

     *
@@ -1069,11 +1000,7 @@ public class InputSettings { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG)

    public static boolean isAccessibilityStickyKeysEnabled(@NonNull Context context) {

        if (!isAccessibilityStickyKeysFeatureEnabled()) {

            return false;

        }

        return Settings.Secure.getIntForUser(context.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_STICKY_KEYS, 0, UserHandle.USER_CURRENT) != 0;

    }
@@ -1092,13 +1019,9 @@ public class InputSettings { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG)

    @RequiresPermission(Manifest.permission.WRITE_SETTINGS)

    public static void setAccessibilityStickyKeysEnabled(@NonNull Context context,

            boolean enabled) {

        if (!isAccessibilityStickyKeysFeatureEnabled()) {

            return;

        }

        Settings.Secure.putIntForUser(context.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_STICKY_KEYS, enabled ? 1 : 0,

                UserHandle.USER_CURRENT);

core/java/android/hardware/input/input_framework.aconfig

+0 −21
Original line number Diff line number Diff line
@@ -6,27 +6,6 @@ container: "system" 
# NOTE: the input_native namespace is deprecated. New flags should be added to the input namespace

# instead.



flag {

    namespace: "input_native"

    name: "keyboard_a11y_sticky_keys_flag"

    description: "Controls if the sticky keys accessibility feature for physical keyboard is available to the user"

    bug: "294546335"

}



flag {

    namespace: "input_native"

    name: "keyboard_a11y_bounce_keys_flag"

    description: "Controls if the bounce keys accessibility feature for physical keyboard is available to the user"

    bug: "294546335"

}



flag {

    namespace: "input_native"

    name: "keyboard_a11y_slow_keys_flag"

    description: "Controls if the slow keys accessibility feature for physical keyboard is available to the user"

    bug: "294546335"

}



flag {

    namespace: "input_native"

    name: "keyboard_glyph_map"

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/AccessibilityShortcutsSource.kt

+27 −33
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ class AccessibilityShortcutsSource @Inject constructor(@Main private val resourc 
        val shortcuts = mutableListOf<KeyboardShortcutInfo>()



        if (keyboardA11yShortcutControl()) {

            if (InputSettings.isAccessibilityBounceKeysFeatureEnabled()) {

            shortcuts.add(

                // Toggle bounce keys:

                //  - Meta + Alt + 3
@@ -62,7 +61,6 @@ class AccessibilityShortcutsSource @Inject constructor(@Main private val resourc 
                    command(META_META_ON or META_ALT_ON, KEYCODE_3)

                }

            )

            }

            if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {

                shortcuts.add(

                    // Toggle mouse keys:
@@ -74,7 +72,6 @@ class AccessibilityShortcutsSource @Inject constructor(@Main private val resourc 
                    }

                )

            }

            if (InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {

            shortcuts.add(

                // Toggle sticky keys:

                //  - Meta + Alt + 5
@@ -84,8 +81,6 @@ class AccessibilityShortcutsSource @Inject constructor(@Main private val resourc 
                    command(META_META_ON or META_ALT_ON, KEYCODE_5)

                }

            )

            }

            if (InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()) {

            shortcuts.add(

                // Toggle slow keys:

                //  - Meta + Alt + 6
@@ -96,7 +91,6 @@ class AccessibilityShortcutsSource @Inject constructor(@Main private val resourc 
                }

            )

        }

        }



        if (enableVoiceAccessKeyGestures()) {

            shortcuts.add(