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

Commit 1d120319 authored Jan 25, 2023 by Tyler Freeman

feat(#AlwaysOnMagnifier): add Setting for enabling Always On Magnification

Bug: b/265086261

Test: manual
Change-Id: I1b2d5797b9c6e7a2fe4349bc780668d0d226693b

parent bfb5f457

core/java/android/provider/Settings.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10955,6 +10955,15 @@ public final class Settings {
	@TestApi		@TestApi
	public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;		public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;

			/**
			* Whether the magnification always on feature is enabled. If true, the magnifier will not
			* deactivate on Activity transitions; it will only zoom out to 100%.
			*
			* @hide
			*/
			public static final String ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED =
			"accessibility_magnification_always_on_enabled";

	/**		/**
	* Whether the following typing focus feature for magnification is enabled.		* Whether the following typing focus feature for magnification is enabled.
	* @hide		* @hide

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

+1 −0

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

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -210,6 +210,7 @@ public class SecureSettings {
	Settings.Secure.ACCESSIBILITY_FLOATING_MENU_ICON_TYPE,		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_ICON_TYPE,
	Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,
	Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
			Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
	Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,		Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,
	Settings.Secure.NOTIFICATION_BUBBLES,		Settings.Secure.NOTIFICATION_BUBBLES,
	Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,		Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -295,6 +295,7 @@ public class SecureSettingsValidators {
	Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
	Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));		Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));
	VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED, BOOLEAN_VALIDATOR);
			VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(		VALIDATORS.put(
	Secure.ACCESSIBILITY_BUTTON_TARGETS,		Secure.ACCESSIBILITY_BUTTON_TARGETS,
	ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);		ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);

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

+4 −0

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

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