From 09821e196e347bda20d3b8c7402d630d45ab7793 Mon Sep 17 00:00:00 2001 From: Sally Date: Wed, 7 Oct 2020 22:22:01 +0000 Subject: [PATCH] Back up Force Bold Text setting and clean up javadoc Bug: b/110991537 Test: builds Change-Id: Ia4040a2dd84dae12fb5061ffb5bcd1d0cb99cbd6 --- core/java/android/provider/Settings.java | 6 ++++++ .../android/provider/settings/backup/SecureSettings.java | 1 + .../settings/validators/SecureSettingsValidators.java | 1 + 3 files changed, 8 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 87334d5bab497..b383b6ed5fafe 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6827,6 +6827,12 @@ public final class Settings { /** * Whether to draw text in bold. * + *

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"; diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index a19761ad2669f..c1bdb56b9da72 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -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, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 27c2564e1273f..388bf283625c2 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -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);