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

Commit 6839486f authored Apr 17, 2025 by Amanda Lin Dietz Committed by Android (Google) Code Review Apr 17, 2025

Merge "[A11y Magnification Keyboard Focus] Add Settings for Magnification...

Merge "[A11y Magnification Keyboard Focus] Add Settings for Magnification keyboard focus following" into main

parents b3615d35 d94c1863

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -12719,6 +12719,13 @@ public final class Settings {
		public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED =
		"accessibility_magnification_follow_typing_enabled";

		/**
		* Whether the following keyboard focus feature for magnification is enabled.
		* @hide
		*/
		public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED =
		"accessibility_magnification_follow_keyboard_enabled";

		/**
		* Whether the magnification joystick controller feature is enabled.
		* @hide

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ message SecureSettingsProto {
		// Setting for accessibility magnification for cursor following mode.
		optional SettingProto accessibility_magnification_cursor_following_mode = 66 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_magnification_magnify_nav_and_ime = 67 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_magnification_follow_keyboard_enabled = 68 [ (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
		@@ -214,6 +214,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED,
		Settings.Secure.ONE_HANDED_MODE_ACTIVATED,
		Settings.Secure.ONE_HANDED_MODE_ENABLED,
		Settings.Secure.ONE_HANDED_MODE_TIMEOUT,

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,9 @@ public class SecureSettingsValidators {
		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED,
		BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE,
		new InclusiveIntegerRangeValidator(

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1868,6 +1868,10 @@ class SettingsProtoDumpUtil {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
		SecureSettingsProto.Accessibility