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

Commit eebf4335 authored Oct 13, 2022 by Lauren Winston

Revert "Add secure settings key for software cursor."

This reverts commit fb43f542.

Reason for revert: Software Cursor not launching in Android U

Test: manual
Change-Id: I3f27b7d8958f455a580758192794308d5f91d152

parent 2d054595

core/java/android/provider/Settings.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -10896,13 +10896,6 @@ public final class Settings {
		public static final String ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT =
		"accessibility_floating_menu_migration_tooltip_prompt";

		/**
		* Setting that specifies whether the software cursor accessibility service is enabled.
		* @hide
		*/
		public static final String ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED =
		"accessibility_software_cursor_enabled";

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

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@ message SecureSettingsProto {
		optional SettingProto odi_captions_volume_ui_enabled = 42 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// 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 ];
		}
		optional Accessibility accessibility = 2;

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,6 @@ public class SecureSettings {
		Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON,
		Settings.Secure.WEAR_TALKBACK_ENABLED,
		Settings.Secure.HBM_SETTING_KEY,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,
		Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED,
		Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO,

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -346,7 +346,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED, BOOLEAN_VALIDATOR);
		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.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);

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -1825,9 +1825,6 @@ class SettingsProtoDumpUtil {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED);
		p.end(accessibilityToken);

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