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

Commit f650a80f authored Jan 07, 2025 by Wenyu Zhang Committed by Android (Google) Code Review Jan 07, 2025

Merge "a11y: Add autoclick cursor area size settings" into main

parents 20279965 4107e698

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -9318,6 +9318,16 @@ public final class Settings {
		public static final String ACCESSIBILITY_AUTOCLICK_DELAY =
		"accessibility_autoclick_delay";

		/**
		* Integer setting specifying the autoclick cursor area size (the radius of the autoclick
		* ring indicator) when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
		*
		* @see #ACCESSIBILITY_AUTOCLICK_ENABLED
		* @hide
		*/
		public static final String ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE =
		"accessibility_autoclick_cursor_area_size";

		/**
		* Whether or not larger size icons are used for the pointer of mouse/trackpad for
		* accessibility.

core/java/android/view/accessibility/AccessibilityManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,15 @@ public final class AccessibilityManager {
		/** @hide */
		public static final int AUTOCLICK_DELAY_DEFAULT = 600;

		/** @hide */
		public static final int AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT = 60;

		/** @hide */
		public static final int AUTOCLICK_CURSOR_AREA_SIZE_MIN = 20;

		/** @hide */
		public static final int AUTOCLICK_CURSOR_AREA_SIZE_MAX = 100;

		/**
		* Activity action: Launch UI to manage which accessibility service or feature is assigned
		* to the navigation bar Accessibility button.

core/proto/android/providers/settings/secure.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ message SecureSettingsProto {
		optional SettingProto accessibility_key_gesture_targets = 59 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto hct_rect_prompt_status = 60 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto em_value = 61 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Settings for accessibility autoclick
		optional SettingProto autoclick_cursor_area_size = 62 [ (android.privacy).dest = DEST_AUTOMATIC ];

		}
		optional Accessibility accessibility = 2;

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ public class SecureSettings {
		Settings.Secure.KEY_REPEAT_TIMEOUT_MS,
		Settings.Secure.KEY_REPEAT_DELAY_MS,
		Settings.Secure.CAMERA_GESTURE_DISABLED,
		Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE,
		Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED,
		Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
		Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,8 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.KEY_REPEAT_TIMEOUT_MS, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.KEY_REPEAT_DELAY_MS, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.CAMERA_GESTURE_DISABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_AUTOCLICK_DELAY, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_LARGE_POINTER_ICON, BOOLEAN_VALIDATOR);