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

Commit 6a8f701e authored Feb 26, 2024 by Isaac Chai Committed by Android (Google) Code Review Feb 26, 2024

Merge "Adding setting for single finger panning settings" into main

parents 4c3a2b67 c7a6edd9

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -11968,6 +11968,16 @@ public final class Settings {
		public static final String ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED =
		"accessibility_pinch_to_zoom_anywhere_enabled";

		/**
		* For magnification feature where panning can be controlled with a single finger.
		*
		* If true, you can pan using a single finger gesture.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED =
		"accessibility_single_finger_panning_enabled";

		/**
		* 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
		@@ -101,6 +101,7 @@ message SecureSettingsProto {
		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 accessibility_pinch_to_zoom_anywhere_enabled = 55 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_single_finger_panning_enabled = 56 [ (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
		@@ -227,6 +227,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		Settings.Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED,
		Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_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

+1 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ public class SecureSettingsValidators {
		Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED, BOOLEAN_VALIDATOR);
		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
		@@ -1864,6 +1864,10 @@ class SettingsProtoDumpUtil {
		Settings.Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.HEARING_AID_RINGTONE_ROUTING,
		SecureSettingsProto.Accessibility.HEARING_AID_RINGTONE_ROUTING);