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

Commit 50082ead authored Feb 07, 2024 by Isaac Chai

Adding settings for pinch to zoom anywhere

Test: Locally tested on emulator
Bug: 324029251

Change-Id: Icee5d4380f6e97a61786ca99b259f0bb411d7e65

parent 1927527c

core/java/android/provider/Settings.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11908,6 +11908,16 @@ public final class Settings {
	public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =		public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =
	"accessibility_magnification_two_finger_triple_tap_enabled";		"accessibility_magnification_two_finger_triple_tap_enabled";

			/**
			* For pinch to zoom anywhere feature.
			*
			* If true, you should be able to pinch to magnify the window anywhere.
			*
			* @hide
			*/
			public static final String ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED =
			"accessibility_pinch_to_zoom_anywhere_enabled";

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

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,7 @@ message SecureSettingsProto {
	optional SettingProto accessibility_force_invert_color_enabled = 52 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto accessibility_force_invert_color_enabled = 52 [ (android.privacy).dest = DEST_AUTOMATIC ];
	optional SettingProto accessibility_magnification_two_finger_triple_tap_enabled = 53 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto accessibility_magnification_two_finger_triple_tap_enabled = 53 [ (android.privacy).dest = DEST_AUTOMATIC ];
	optional SettingProto qs_targets = 54 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto qs_targets = 54 [ (android.privacy).dest = DEST_AUTOMATIC ];
			optional SettingProto accessibility_pinch_to_zoom_anywhere_enabled = 55 [ (android.privacy).dest = DEST_AUTOMATIC ];

	}		}
	optional Accessibility accessibility = 2;		optional Accessibility accessibility = 2;

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -226,6 +226,7 @@ public class SecureSettings {
	Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
	Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
	Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
			Settings.Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED,
	Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,		Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,
	Settings.Secure.NOTIFICATION_BUBBLES,		Settings.Secure.NOTIFICATION_BUBBLES,
	Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,		Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -319,6 +319,7 @@ public class SecureSettingsValidators {
	VALIDATORS.put(		VALIDATORS.put(
	Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,		Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
	BOOLEAN_VALIDATOR);		BOOLEAN_VALIDATOR);
			VALIDATORS.put(Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(		VALIDATORS.put(
	Secure.ACCESSIBILITY_BUTTON_TARGETS,		Secure.ACCESSIBILITY_BUTTON_TARGETS,
	ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);

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

+4 −0

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