Merge "Added key Magnification Mode" (a70ad07c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -8542,6 +8542,29 @@ public final class Settings {
		*/
		public static final String WINDOW_MAGNIFICATION = "window_magnification";

		/**
		* Controls magnification mode when magnification is enabled via a system-wide
		* triple tap gesture or the accessibility shortcut.
		*
		* @see#ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
		* @see#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
		* @hide
		*/
		public static final String ACCESSIBILITY_MAGNIFICATION_MODE =
		"accessibility_magnification_mode";

		/**
		* Magnification mode value that magnifies whole display.
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN = 0x1;

		/**
		* Magnification mode value that magnifies magnify particular region in a window
		* @hide
		*/
		public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;

		/**
		* Keys we no longer back up under the current schema, but want to continue to
		* process when restoring historical backup datasets.

+2 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,8 @@ message SecureSettingsProto {
		// Settings for accessibility timeout
		optional SettingProto non_interactive_ui_timeout_ms = 32 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto interactive_ui_timeout_ms = 33 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Settings for magnification mode
		optional SettingProto accessibility_magnification_mode = 34 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Accessibility accessibility = 2;

+1 −0

Original line number	Diff line number	Diff line
		@@ -159,5 +159,6 @@ public class SecureSettings {
		Settings.Secure.AWARE_TAP_PAUSE_GESTURE_COUNT,
		Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT,
		Settings.Secure.PEOPLE_STRIP,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
		};
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -239,5 +239,9 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.DISPLAY_DENSITY_FORCED, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.TAP_GESTURE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.PEOPLE_STRIP, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
		new InclusiveIntegerRangeValidator(
		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW));
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -1820,6 +1820,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS,
		SecureSettingsProto.Accessibility.INTERACTIVE_UI_TIMEOUT_MS);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_MAGNIFICATION_MODE);
		p.end(accessibilityToken);

		dumpSetting(s, p,