Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Candice Lo
2023-03-10 01:16:17 +00:00
committed by Automerger Merge Worker
parent f7305e7643 1718a9c347
commit 97325239fe
5 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

@@ -8000,6 +8000,15 @@ public final class Settings {
public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED = public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED =
"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 * Setting that specifies whether display color space adjustment is
* enabled. * enabled.

2
core/proto/android/providers/settings/secure.proto
View File

@@ -89,6 +89,8 @@ 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 ];
// Settings for font scaling
optional SettingProto accessibility_font_scaling_has_been_changed = 51 [ (android.privacy).dest = DEST_AUTOMATIC ];
} }
optional Accessibility accessibility = 2; optional Accessibility accessibility = 2;

3
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -221,6 +221,7 @@ public class SecureSettings {
Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO, Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO,
Settings.Secure.BLUETOOTH_LE_BROADCAST_CODE, Settings.Secure.BLUETOOTH_LE_BROADCAST_CODE,
Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME, 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
}; };
} }

1
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -355,5 +355,6 @@ public class SecureSettingsValidators {
VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_CODE, ANY_STRING_VALIDATOR); 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.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME, ANY_STRING_VALIDATOR);
VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, BOOLEAN_VALIDATOR);
} }
} }

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -1828,6 +1828,9 @@ 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_FONT_SCALING_HAS_BEEN_CHANGED,
SecureSettingsProto.Accessibility.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED);
p.end(accessibilityToken); p.end(accessibilityToken);
final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP); final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);