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

Commit 97325239 authored Mar 10, 2023 by Candice Lo Committed by Automerger Merge Worker Mar 10, 2023

Merge "Add key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED" into tm-qpr-dev am: 1718a9c3

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

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

parents f7305e76 1718a9c3

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -8000,6 +8000,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
		@@ -89,6 +89,8 @@ message SecureSettingsProto {
		// Setting for accessibility magnification for following typing.
		optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto contrast_level = 44 [ (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

+2 −1

Original line number	Diff line number	Diff line
		@@ -221,6 +221,7 @@ public class SecureSettings {
		Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_CODE,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME,
		Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED
		Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED,
		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
		@@ -355,5 +355,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_CODE, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);
		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
		@@ -1828,6 +1828,9 @@ class SettingsProtoDumpUtil {
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
		SecureSettingsProto.Accessibility
		.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED);
		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);