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

Commit 24afe175 authored Oct 23, 2023 by Jean Chen

feat(MultiFingerMultiTap): Add Settings for control magnification two fingers...

feat(MultiFingerMultiTap): Add Settings for control magnification two fingers triple tap enabled gesture

Bug: 297805269
Test: manual
Change-Id: Iada9a6c14a94f352d83604405cc25f442f0a791e

parent 9187f490

core/java/android/provider/Settings.java

+9 −0

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

		/**
		* Setting that specifies whether the display magnification is enabled via a system-wide
		* two fingers triple tap gesture.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =
		"accessibility_magnification_two_finger_triple_tap_enabled";

		/**
		* Controls magnification enable gesture. Accessibility magnification can have one or more
		* enable gestures.

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ message SecureSettingsProto {
		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 SettingProto accessibility_magnification_two_finger_triple_tap_enabled = 54 [ (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
		@@ -220,6 +220,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		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

+3 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,9 @@ 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_TWO_FINGER_TRIPLE_TAP_ENABLED,
		BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,
		new InclusiveIntegerRangeValidator(
		Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE,

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_TWO_FINGER_TRIPLE_TAP_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,
		SecureSettingsProto.Accessibility