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

Commit a6c4eca0 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Make A11y feature flags accessible to CTS tests" into main

parents 690a0c9a 23df8f41

core/api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -1775,6 +1775,12 @@ 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 @FlaggedApi("com.android.hardware.input.keyboard_a11y_sticky_keys_flag") public static boolean isAccessibilityStickyKeysEnabled(@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 @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_SECURE_SETTINGS) public static void setMaximumObscuringOpacityForTouch(@NonNull android.content.Context, @FloatRange(from=0, to=1) float);

    field public static final int DEFAULT_POINTER_SPEED = 0; // 0x0

  }

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

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +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_SLOW_KEYS_FLAG;

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

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

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

import static com.android.hardware.input.Flags.keyboardA11yStickyKeysFlag;
@@ -23,6 +26,7 @@ import static com.android.hardware.input.Flags.touchpadTapDragging; 
import static com.android.input.flags.Flags.enableInputFilterRustImpl;



import android.Manifest;

import android.annotation.FlaggedApi;

import android.annotation.FloatRange;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;
@@ -465,6 +469,8 @@ public class InputSettings { 
     *

     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_BOUNCE_KEYS_FLAG)

    public static int getAccessibilityBounceKeysThreshold(@NonNull Context context) {

        if (!isAccessibilityBounceKeysFeatureEnabled()) {

            return 0;
@@ -487,6 +493,8 @@ 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) {
@@ -545,6 +553,8 @@ public class InputSettings { 
     *

     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_SLOW_KEYS_FLAG)

    public static int getAccessibilitySlowKeysThreshold(@NonNull Context context) {

        if (!isAccessibilitySlowKeysFeatureFlagEnabled()) {

            return 0;
@@ -567,6 +577,8 @@ 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) {
@@ -614,6 +626,8 @@ public class InputSettings { 
     *

     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG)

    public static boolean isAccessibilityStickyKeysEnabled(@NonNull Context context) {

        if (!isAccessibilityStickyKeysFeatureEnabled()) {

            return false;
@@ -635,6 +649,8 @@ 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) {

core/java/android/provider/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -8005,6 +8005,7 @@ public final class Settings { 
         *

         * @hide

         */

        @Readable

        public static final String ACCESSIBILITY_BOUNCE_KEYS = "accessibility_bounce_keys";















        /**









@@ -8016,6 +8017,7 @@ public final class Settings {













         *















         * @hide















         */













        @Readable















        public static final String ACCESSIBILITY_SLOW_KEYS = "accessibility_slow_keys";





























        /**









@@ -8025,6 +8027,7 @@ public final class Settings {













         *















         * @hide















         */













        @Readable















        public static final String ACCESSIBILITY_STICKY_KEYS = "accessibility_sticky_keys";





























        /**