Merge "Move ENABLED_ACCESSIBILITY_AUDIO_DESCRITPION_BY_DEFAULT from... (030f8655) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -7157,6 +7157,13 @@ public final class Settings {
		@Readable
		public static final String ACCESSIBILITY_ENABLED = "accessibility_enabled";

		/**
		* Whether select sound track with audio description by default.
		* @hide
		*/
		public static final String ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT =
		"enabled_accessibility_audio_description_by_default";

		/**
		* Setting specifying if the accessibility shortcut is enabled.
		* @hide
		@@ -10414,14 +10421,6 @@ public final class Settings {
		public static final String ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED =
		"enable_accessibility_global_gesture_enabled";

		/**
		* Whether select sound track with audio description by default.
		* @hide
		*/
		@Readable
		public static final String ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT =
		"enable_accessibility_audio_description_by_default";

		/**
		* Whether Airplane Mode is on.
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ public class SecureSettings {
		Settings.Secure.AUTOFILL_SERVICE,
		Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
		Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
		Settings.Secure.ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT,
		Settings.Secure.ENABLED_VR_LISTENERS,
		Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,
		Settings.Secure.TOUCH_EXPLORATION_ENABLED,

+2 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,8 @@ public class SecureSettingsValidators {
		new InclusiveFloatRangeValidator(1.0f, Float.MAX_VALUE));
		VALIDATORS.put(
		Secure.ENABLED_ACCESSIBILITY_SERVICES, COLON_SEPARATED_COMPONENT_LIST_VALIDATOR);
		VALIDATORS.put(
		Secure.ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ENABLED_VR_LISTENERS, COLON_SEPARATED_COMPONENT_LIST_VALIDATOR);
		VALIDATORS.put(
		Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

+1 −1

Original line number	Diff line number	Diff line
		@@ -272,7 +272,6 @@ public class SettingsBackupTest {
		Settings.Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD,
		Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,
		Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,
		Settings.Global.ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT,
		Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT,
		Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS,
		Settings.Global.ENHANCED_4G_MODE_ENABLED,
		@@ -710,6 +709,7 @@ public class SettingsBackupTest {
		Settings.Secure.DOCKED_CLOCK_FACE,
		Settings.Secure.DOZE_PULSE_ON_LONG_PRESS,
		Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
		Settings.Secure.ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT,
		Settings.Secure.ENABLED_INPUT_METHODS, // Intentionally removed in P
		Settings.Secure.ENABLED_NOTIFICATION_ASSISTANT,
		Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,