Merge "Remove unused critical accessibility settings from backup/restore" (a9b443de) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -6013,8 +6013,6 @@ public final class Settings {
		@Deprecated
		public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password";

		private static final Validator ACCESSIBILITY_SPEAK_PASSWORD_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Whether to draw text with high contrast while in accessibility mode.
		*
		@@ -7908,7 +7906,6 @@ public final class Settings {
		ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN,
		ACCESSIBILITY_SHORTCUT_ENABLED,
		ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN,
		ACCESSIBILITY_SPEAK_PASSWORD,
		ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
		ACCESSIBILITY_CAPTIONING_PRESET,
		ACCESSIBILITY_CAPTIONING_ENABLED,
		@@ -8022,7 +8019,6 @@ public final class Settings {
		ACCESSIBILITY_SHORTCUT_ENABLED_VALIDATOR);
		VALIDATORS.put(ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN,
		ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN_VALIDATOR);
		VALIDATORS.put(ACCESSIBILITY_SPEAK_PASSWORD, ACCESSIBILITY_SPEAK_PASSWORD_VALIDATOR);
		VALIDATORS.put(ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
		ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED_VALIDATOR);
		VALIDATORS.put(ACCESSIBILITY_CAPTIONING_PRESET,

+1 −0

Original line number	Diff line number	Diff line
		@@ -491,6 +491,7 @@ public class SettingsBackupTest {
		private static final Set<String> BACKUP_BLACKLISTED_SECURE_SETTINGS =
		newHashSet(
		Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE,
		Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, // Deprecated since O.
		Settings.Secure.ALLOWED_GEOLOCATION_ORIGINS,
		Settings.Secure.ALWAYS_ON_VPN_APP,
		Settings.Secure.ALWAYS_ON_VPN_LOCKDOWN,

+0 −2

Original line number	Diff line number	Diff line
		@@ -264,12 +264,10 @@ public class SettingsHelper {
		// these features working after the restore.
		switch (name) {
		case Settings.Secure.ACCESSIBILITY_ENABLED:
		case Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD:
		case Settings.Secure.TOUCH_EXPLORATION_ENABLED:
		case Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED:
		case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED:
		case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED:
		case Settings.Secure.UI_NIGHT_MODE:
		return Settings.Secure.getInt(mContext.getContentResolver(), name, 0) != 0;
		case Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES:
		case Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES: