Merge "Defines setting for standalone FAB targets" into main (d4b83a5e) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -8501,6 +8501,19 @@ public final class Settings {
		@Readable
		public static final String ACCESSIBILITY_BUTTON_TARGETS = "accessibility_button_targets";

		/**
		* Setting specifying the accessibility services, shortcut targets or features
		* to be toggled via the floating accessibility menu
		*
		* <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
		*/
		@Readable
		public static final String ACCESSIBILITY_FLOATING_MENU_TARGETS =
		"accessibility_floating_menu_targets";

		/**
		* Setting specifying the accessibility services, accessibility shortcut targets,
		* or features to be toggled via a tile in the quick settings panel.

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ message SecureSettingsProto {
		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 SettingProto accessibility_floating_menu_targets = 57 [ (android.privacy).dest = DEST_AUTOMATIC ];

		}
		optional Accessibility accessibility = 2;

+2 −1

Original line number	Diff line number	Diff line
		@@ -269,6 +269,7 @@ public class SecureSettings {
		Settings.Secure.CAMERA_EXTENSIONS_FALLBACK,
		Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED,
		Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,
		Settings.Secure.AUDIO_DEVICE_INVENTORY
		Settings.Secure.AUDIO_DEVICE_INVENTORY,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS
		};
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,9 @@ public class SecureSettingsValidators {
		VALIDATORS.put(
		Secure.ACCESSIBILITY_BUTTON_TARGETS,
		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS,
		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_QS_TARGETS,
		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);

+3 −0

Original line number	Diff line number	Diff line
		@@ -1837,6 +1837,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_TARGETS);
		dumpSetting(s, p,
		Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,
		SecureSettingsProto.Accessibility.ODI_CAPTIONS_VOLUME_UI_ENABLED);