Merge "feat(multi finger multi tap): add Setting for control magnification... (3d252012) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+39 −0

Original line number	Diff line number	Diff line
		@@ -11606,6 +11606,45 @@ public final class Settings {
		public static final String ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED =
		"accessibility_magnification_joystick_enabled";

		/**
		* Controls magnification enable gesture. Accessibility magnification can have one or more
		* enable gestures.
		*
		* @see #ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE
		* @see #ACCESSIBILITY_MAGNIFICATION_GESTURE_SINGLE_FINGER_TRIPLE_TAP
		* @see #ACCESSIBILITY_MAGNIFICATION_GESTURE_TWO_FINGER_TRIPLE_TAP
		* @hide
		*/
		public static final String ACCESSIBILITY_MAGNIFICATION_GESTURE =
		"accessibility_magnification_gesture";

		/**
		* Magnification enable gesture value that is a default value.
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE = 0x0;

		/**
		* Magnification enable gesture value is single finger triple tap.
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_SINGLE_FINGER_TRIPLE_TAP = 0x1;

		/**
		* Magnification enable gesture value is two finger triple tap.
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_TWO_FINGER_TRIPLE_TAP = 0x2;

		/**
		* Magnification enable gesture values include single finger triple tap and two finger
		* triple tap.
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_ALL =
		ACCESSIBILITY_MAGNIFICATION_GESTURE_SINGLE_FINGER_TRIPLE_TAP
		\| ACCESSIBILITY_MAGNIFICATION_GESTURE_TWO_FINGER_TRIPLE_TAP;

		/**
		* Controls magnification capability. Accessibility magnification is capable of at least one
		* of the magnification modes.

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ message SecureSettingsProto {
		// Settings for font scaling
		optional SettingProto accessibility_font_scaling_has_been_changed = 51 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_force_invert_color_enabled = 52 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_magnification_gesture = 53 [ (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
		@@ -218,6 +218,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,
		Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,
		Settings.Secure.NOTIFICATION_BUBBLES,
		Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,10 @@ public class SecureSettingsValidators {
		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_JOYSTICK_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,
		new InclusiveIntegerRangeValidator(
		Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE,
		Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE_ALL));
		VALIDATORS.put(
		Secure.ACCESSIBILITY_BUTTON_TARGETS,
		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);

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

+4 −0

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