Merge "Remove flag KeyboardA11yMouseKeys" into main (13cefb79) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -1881,11 +1881,11 @@ package android.hardware.input {
		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 public static boolean isAccessibilityMouseKeysEnabled(@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 @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 @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityMouseKeysEnabled(@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);

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

+0 −50

Original line number	Diff line number	Diff line
		@@ -16,9 +16,7 @@

		package android.hardware.input;

		import static com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_MOUSE_KEYS;
		import static com.android.hardware.input.Flags.enableCustomizableInputGestures;
		import static com.android.hardware.input.Flags.keyboardA11yMouseKeys;
		import static com.android.hardware.input.Flags.mouseScrollingAcceleration;
		import static com.android.hardware.input.Flags.mouseReverseVerticalScrolling;
		import static com.android.hardware.input.Flags.mouseSwapPrimaryButton;
		@@ -1071,21 +1069,6 @@ public class InputSettings {
		UserHandle.USER_CURRENT);
		}

		/**
		* Whether Accessibility mouse keys feature flag is enabled.
		*
		* <p>
		* ‘Mouse keys’ is an accessibility feature to aid users who have physical disabilities,
		* that allows the user to use the keys on the keyboard to control the mouse pointer and
		* other perform other mouse functionality.
		* </p>
		*
		* @hide
		*/
		public static boolean isAccessibilityMouseKeysFeatureFlagEnabled() {
		return keyboardA11yMouseKeys();
		}

		/**
		* Whether Accessibility mouse keys is enabled.
		*
		@@ -1098,11 +1081,7 @@ public class InputSettings {
		* @hide
		*/
		@TestApi
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		public static boolean isAccessibilityMouseKeysEnabled(@NonNull Context context) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return false;
		}
		return Settings.Secure.getIntForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED, 0, UserHandle.USER_CURRENT)
		!= 0;
		@@ -1120,13 +1099,9 @@ public class InputSettings {
		* @hide
		*/
		@TestApi
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		@RequiresPermission(Manifest.permission.WRITE_SETTINGS)
		public static void setAccessibilityMouseKeysEnabled(@NonNull Context context,
		boolean enabled) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return;
		}
		Settings.Secure.putIntForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED, enabled ? 1 : 0,
		UserHandle.USER_CURRENT);
		@@ -1144,11 +1119,7 @@ public class InputSettings {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		public static float getAccessibilityMouseKeysAcceleration(@NonNull Context context) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return 0;
		}
		return Settings.Secure.getFloatForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ACCELERATION,
		DEFAULT_MOUSE_KEYS_ACCELERATION,
		@@ -1166,13 +1137,9 @@ public class InputSettings {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
		public static void setAccessibilityMouseKeysAcceleration(@NonNull Context context,
		float acceleration) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return;
		}
		Settings.Secure.putFloatForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ACCELERATION,
		acceleration, UserHandle.USER_CURRENT);
		@@ -1190,11 +1157,7 @@ public class InputSettings {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		public static int getAccessibilityMouseKeysMaxSpeed(@NonNull Context context) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return 0;
		}
		return Settings.Secure.getIntForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_MAX_SPEED,
		DEFAULT_MOUSE_KEYS_MAX_SPEED,
		@@ -1212,13 +1175,9 @@ public class InputSettings {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		@RequiresPermission(Manifest.permission.WRITE_SETTINGS)
		public static void setAccessibilityMouseKeysMaxSpeed(@NonNull Context context,
		int maxSpeed) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return;
		}
		Settings.Secure.putIntForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_MAX_SPEED,
		maxSpeed, UserHandle.USER_CURRENT);
		@@ -1237,12 +1196,7 @@ public class InputSettings {
		* @return Whether user can use primary keys to control the Mouse Key.
		* @hide
		*/
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		public static boolean isPrimaryKeysForMouseKeysEnabled(@NonNull Context context) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return false;
		}

		return Settings.Secure.getIntForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_USE_PRIMARY_KEYS,
		1, UserHandle.USER_CURRENT) != 0;
		@@ -1259,13 +1213,9 @@ public class InputSettings {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
		@RequiresPermission(Manifest.permission.WRITE_SETTINGS)
		public static void setPrimaryKeysForMouseKeysEnabled(
		@NonNull Context context, boolean enabled) {
		if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
		return;
		}

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

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -13,13 +13,6 @@ flag {
		bug: "345440920"
		}

		flag {
		namespace: "input_native"
		name: "keyboard_a11y_mouse_keys"
		description: "Controls if the mouse keys accessibility feature for physical keyboard is available to the user"
		bug: "341799888"
		}

		flag {
		namespace: "input_native"
		name: "touchpad_visualizer"

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

+10 −21

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.keyboard.shortcut.data.source

		import android.content.res.Resources
		import android.hardware.input.InputSettings
		import android.view.KeyEvent.KEYCODE_3
		import android.view.KeyEvent.KEYCODE_4
		import android.view.KeyEvent.KEYCODE_5
		@@ -55,38 +54,28 @@ class AccessibilityShortcutsSource @Inject constructor(@Main private val resourc
		shortcuts.add(
		// Toggle bounce keys:
		// - Meta + Alt + 3
		shortcutInfo(
		resources.getString(R.string.group_accessibility_toggle_bounce_keys)
		) {
		shortcutInfo(resources.getString(R.string.group_accessibility_toggle_bounce_keys)) {
		command(META_META_ON or META_ALT_ON, KEYCODE_3)
		}
		)
		if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
		shortcuts.add(
		// Toggle mouse keys:
		// - Meta + Alt + 4
		shortcutInfo(
		resources.getString(R.string.group_accessibility_toggle_mouse_keys)
		) {
		shortcutInfo(resources.getString(R.string.group_accessibility_toggle_mouse_keys)) {
		command(META_META_ON or META_ALT_ON, KEYCODE_4)
		}
		)
		}
		shortcuts.add(
		// Toggle sticky keys:
		// - Meta + Alt + 5
		shortcutInfo(
		resources.getString(R.string.group_accessibility_toggle_sticky_keys)
		) {
		shortcutInfo(resources.getString(R.string.group_accessibility_toggle_sticky_keys)) {
		command(META_META_ON or META_ALT_ON, KEYCODE_5)
		}
		)
		shortcuts.add(
		// Toggle slow keys:
		// - Meta + Alt + 6
		shortcutInfo(
		resources.getString(R.string.group_accessibility_toggle_slow_keys)
		) {
		shortcutInfo(resources.getString(R.string.group_accessibility_toggle_slow_keys)) {
		command(META_META_ON or META_ALT_ON, KEYCODE_6)
		}
		)

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import static android.view.accessibility.AccessibilityManager.FlashNotificationR

		import static com.android.hardware.input.Flags.enableTalkbackAndMagnifierKeyGestures;
		import static com.android.hardware.input.Flags.enableVoiceAccessKeyGestures;
		import static com.android.hardware.input.Flags.keyboardA11yMouseKeys;
		import static com.android.internal.accessibility.AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME;
		import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
		import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
		@@ -6303,9 +6302,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		}

		boolean readMouseKeysEnabledLocked(AccessibilityUserState userState) {
		if (!keyboardA11yMouseKeys()) {
		return false;
		}
		final boolean isMouseKeysEnabled =
		Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED, 0, userState.mUserId) == 1;