Merge "Revert "Add Settings.Secure values for Software Cursor settings for hiding"" (501d02a1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -10903,23 +10903,6 @@ public final class Settings {
		public static final String ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED =
		"accessibility_software_cursor_enabled";

		/**
		* Software Cursor settings that specifies whether trigger hints are enabled.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED =
		"accessibility_software_cursor_trigger_hints_enabled";

		/**
		* Software Cursor settings that specifies whether triggers are shifted when the keyboard
		* is shown.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED =
		"accessibility_software_cursor_keyboard_shift_enabled";

		/**
		* Whether the Adaptive connectivity option is enabled.
		*

+0 −8

Original line number	Diff line number	Diff line
		@@ -89,14 +89,6 @@ message SecureSettingsProto {
		// Setting for accessibility magnification for following typing.
		optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_software_cursor_enabled = 44 [ (android.privacy).dest = DEST_AUTOMATIC ];

		message SoftwareCursorSettings {
		optional SettingProto trigger_hints_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto keyboard_shift_enabled = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}

		optional SoftwareCursorSettings accessibility_software_cursor_settings = 45 [ (android.privacy).dest = DEST_AUTOMATIC ];

		}
		optional Accessibility accessibility = 2;

+0 −2

Original line number	Diff line number	Diff line
		@@ -214,8 +214,6 @@ public class SecureSettings {
		Settings.Secure.WEAR_TALKBACK_ENABLED,
		Settings.Secure.HBM_SETTING_KEY,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED,
		Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED,
		Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO,

+0 −4

Original line number	Diff line number	Diff line
		@@ -347,10 +347,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.WEAR_TALKBACK_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.HBM_SETTING_KEY, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_CODE, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME, ANY_STRING_VALIDATOR);

+0 −6

Original line number	Diff line number	Diff line
		@@ -1828,12 +1828,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED,
		SecureSettingsProto.Accessibility.SoftwareCursorSettings.TRIGGER_HINTS_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED,
		SecureSettingsProto.Accessibility.SoftwareCursorSettings.KEYBOARD_SHIFT_ENABLED);
		p.end(accessibilityToken);

		final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);