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

Commit eb806d84 authored by Sally Yuen's avatar Sally Yuen Committed by Android (Google) Code Review
Browse files

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

parents 7c200e5b 09821e19

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -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";

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -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,

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0
Original line number Diff line number Diff line
@@ -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);