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

Commit 42a4d003 authored Mar 03, 2023 by Candice Lo Committed by Automerger Merge Worker Mar 03, 2023

Merge "Add key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED" into udc-dev am:...

Merge "Add key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED" into udc-dev am: 1bcc280a am: 9de61314

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21571009

Change-Id: I658d7c570ed7195cd27cbab852783f3952e32c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 51820d18 9de61314

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -8299,6 +8299,15 @@ public final class Settings {
		public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED =
		"accessibility_display_inversion_enabled";

		/**
		* Flag that specifies whether font size has been changed. The flag will
		* be set when users change the scaled value of font size for the first time.
		* @hide
		*/
		@Readable
		public static final String ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED =
		"accessibility_font_scaling_has_been_changed";

		/**
		* Setting that specifies whether display color space adjustment is
		* enabled.

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,8 @@ message SecureSettingsProto {
		optional SettingProto hearing_aid_media_routing = 48 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto hearing_aid_system_sounds_routing = 49 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_magnification_joystick_enabled = 50 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Settings for font scaling
		optional SettingProto accessibility_font_scaling_has_been_changed = 51 [ (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
		@@ -239,5 +239,6 @@ public class SecureSettings {
		Settings.Secure.HEARING_AID_CALL_ROUTING,
		Settings.Secure.HEARING_AID_MEDIA_ROUTING,
		Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED
		};
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -376,5 +376,6 @@ public class SecureSettingsValidators {
		new DiscreteValueValidator(new String[] {"0", "1", "2"}));
		VALIDATORS.put(Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
		new DiscreteValueValidator(new String[] {"0", "1", "2"}));
		VALIDATORS.put(Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, BOOLEAN_VALIDATOR);
		}
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1852,6 +1852,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
		SecureSettingsProto.Accessibility.HEARING_AID_SYSTEM_SOUNDS_ROUTING);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED);
		p.end(accessibilityToken);

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