Merge "Add setting for Key Gesture accessibility shortcuts" into main (5299e1a8) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -8686,6 +8686,19 @@ public final class Settings {
		*/
		public static final String ACCESSIBILITY_QS_TARGETS = "accessibility_qs_targets";

		/**
		* Setting specifying the accessibility services, accessibility shortcut targets,
		* or features to be toggled via a keyboard shortcut gesture.
		*
		* <p> This is a colon-separated string list which contains the flattened
		* {@link ComponentName} and the class name of a system class implementing a supported
		* accessibility feature.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_KEY_GESTURE_TARGETS =
		"accessibility_key_gesture_targets";

		/**
		* The system class name of magnification controller which is a target to be toggled via
		* accessibility shortcut or accessibility button.

+1 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ message SecureSettingsProto {
		optional SettingProto accessibility_single_finger_panning_enabled = 56 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_gesture_targets = 57 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto display_daltonizer_saturation_level = 58 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_key_gesture_targets = 59 [ (android.privacy).dest = DEST_AUTOMATIC ];

		}
		optional Accessibility accessibility = 2;

+1 −0

Original line number	Diff line number	Diff line
		@@ -284,5 +284,6 @@ public class SecureSettings {
		Settings.Secure.MANDATORY_BIOMETRICS,
		Settings.Secure.MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED,
		Settings.Secure.ADVANCED_PROTECTION_MODE,
		Settings.Secure.ACCESSIBILITY_KEY_GESTURE_TARGETS,
		};
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,9 @@ public class SecureSettingsValidators {
		VALIDATORS.put(
		Secure.ACCESSIBILITY_QS_TARGETS,
		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_KEY_GESTURE_TARGETS,
		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ONE_HANDED_MODE_ACTIVATED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ONE_HANDED_MODE_ENABLED, BOOLEAN_VALIDATOR);

+3 −0

Original line number	Diff line number	Diff line
		@@ -1822,6 +1822,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_QS_TARGETS,
		SecureSettingsProto.Accessibility.QS_TARGETS);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_KEY_GESTURE_TARGETS,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_KEY_GESTURE_TARGETS);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_MAGNIFICATION_CAPABILITY);