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

Commit feddccc2 authored Apr 14, 2025 by Jean Chen Committed by Android (Google) Code Review Apr 14, 2025

Merge changes from topic "magnify_ime" into main

* changes:
  feat(magnify_ime): Add Option to Magnify Navigation Bar and IME [1/2]
  feat(Magnify_ime): Add Settings for control magnify nav bar and keyboard feature

parents f36e0727 04497c48

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -12692,6 +12692,14 @@ public final class Settings {
		public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =
		"accessibility_magnification_two_finger_triple_tap_enabled";

		/**
		* Whether the magnify navigation bar and keyboard feature is enabled.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME =
		"accessibility_magnification_magnify_nav_and_ime";

		/**
		* For pinch to zoom anywhere feature.
		*

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ message SecureSettingsProto {
		optional SettingProto autoclick_revert_to_left_click = 65 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Setting for accessibility magnification for cursor following mode.
		optional SettingProto accessibility_magnification_cursor_following_mode = 66 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_magnification_magnify_nav_and_ime = 67 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Accessibility accessibility = 2;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME,
		Settings.Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED,
		Settings.Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED,
		Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED,

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,7 @@ public class SecureSettingsValidators {
		VALIDATORS.put(
		Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1888,6 +1888,10 @@ class SettingsProtoDumpUtil {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED,
		SecureSettingsProto.Accessibility