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 udc-dev am: 1bcc280abe

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

Change-Id: I01605c52f49e84b6e0d3b157685fcbac9809fdc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Candice Lo
2023-03-03 02:08:32 +00:00
committed by Automerger Merge Worker
parent 708a5210cd 1bcc280abe
commit 9de6131469
5 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8288,6 +8288,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

@@ -95,6 +95,8 @@ message SecureSettingsProto {
optional SettingProto hearing_aid_media_routing = 48 [ (android.privacy).dest = DEST_AUTOMATIC ]; 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 hearing_aid_system_sounds_routing = 49 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto accessibility_magnification_joystick_enabled = 50 [ (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; optional Accessibility accessibility = 2;

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

@@ -239,5 +239,6 @@ public class SecureSettings {
Settings.Secure.HEARING_AID_CALL_ROUTING, Settings.Secure.HEARING_AID_CALL_ROUTING,
Settings.Secure.HEARING_AID_MEDIA_ROUTING, Settings.Secure.HEARING_AID_MEDIA_ROUTING,
Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED
}; };
} }

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

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

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

@@ -1852,6 +1852,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
SecureSettingsProto.Accessibility.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); p.end(accessibilityToken);
final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP); final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);