Merge "a11y: Add cursor following mode definitions" into main (c986d323) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+42 −0

Original line number	Diff line number	Diff line
		@@ -12583,6 +12583,48 @@ public final class Settings {
		public static final String ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED =
		"accessibility_magnification_always_on_enabled";

		/**
		* Controls how the magnification follows the cursor.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE =
		"accessibility_magnification_cursor_following_mode";

		/**
		* Magnification cursor following mode value for the continuous mode.
		*
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS = 0;

		/**
		* Magnification cursor following mode value for the center mode.
		*
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CENTER = 1;

		/**
		* Magnification cursor following mode value for the edge mode.
		*
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE = 2;

		/**
		* Different cursor following settings that can be used as values with
		* {@link #ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE}.
		* @hide
		*/
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(prefix = { "ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_" },
		value = {
		ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS,
		ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CENTER,
		ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE})
		public @interface AccessibilityMagnificationCursorFollowingMode {}

		/**
		* Whether the following typing focus feature for magnification is enabled.
		* @hide

+2 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ message SecureSettingsProto {
		optional SettingProto autoclick_ignore_minor_cursor_movement = 63 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto autoclick_panel_position = 64 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto autoclick_revert_to_left_click = 65 [ (android.privacy).dest = DEST_AUTOMATIC ];

		// Setting for accessibility magnification for cursor following mode.
		optional SettingProto accessibility_magnification_cursor_following_mode = 66 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Accessibility accessibility = 2;

+1 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
		Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED,

+4 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,10 @@ public class SecureSettingsValidators {
		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE,
		new InclusiveIntegerRangeValidator(
		Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS,
		Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE));
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,

+4 −0

Original line number	Diff line number	Diff line
		@@ -1880,6 +1880,10 @@ class SettingsProtoDumpUtil {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		SecureSettingsProto.Accessibility