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

Merge "Back up Force Bold Text setting and clean up javadoc"

Browse Source
This commit is contained in:
Sally Yuen
2020-10-08 17:02:06 +00:00
committed by Android (Google) Code Review
parent 7c200e5bdc 09821e196e
commit eb806d847d
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6827,6 +6827,12 @@ public final class Settings {
/**
* Whether to draw text in bold.
*
* <p>Values:
* 1 - Text is not displayed in bold. (Default)
* 2 - Text is displayed in bold.
*
* @see Configuration#FORCE_BOLD_TEXT_NO
* @see Configuration#FORCE_BOLD_TEXT_YES
* @hide
*/
public static final String FORCE_BOLD_TEXT = "force_bold_text";

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

@@ -60,6 +60,7 @@ public class SecureSettings {
Settings.Secure.ACCESSIBILITY_CAPTIONING_TYPEFACE,
Settings.Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
Settings.Secure.ACCESSIBILITY_CAPTIONING_WINDOW_COLOR,
Settings.Secure.FORCE_BOLD_TEXT,
Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL,
Settings.Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS,
Settings.Secure.TTS_DEFAULT_RATE,

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

@@ -102,6 +102,7 @@ public class SecureSettingsValidators {
Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
new InclusiveFloatRangeValidator(0.5f, 2.0f));
VALIDATORS.put(Secure.ACCESSIBILITY_CAPTIONING_WINDOW_COLOR, ANY_INTEGER_VALIDATOR);
VALIDATORS.put(Secure.FORCE_BOLD_TEXT, new DiscreteValueValidator(new String[] {"1", "2"}));
VALIDATORS.put(Secure.REDUCE_BRIGHT_COLORS_LEVEL, PERCENTAGE_INTEGER_VALIDATOR);
VALIDATORS.put(Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.TTS_DEFAULT_RATE, NON_NEGATIVE_INTEGER_VALIDATOR);