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

Commit 18ba6b80 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Permit all daltonizer settings to be restored" into pi-dev am: 33975d7a 

am: a3d986be

Change-Id: Ie6477db0a0ea456085a99701836c8a57a3b3fb04
parents bd8e3f6c a3d986be

core/java/android/provider/Settings.java

+7 −3
Original line number Diff line number Diff line
@@ -6199,10 +6199,13 @@ public final class Settings { 


        /**

         * Integer property that specifies the type of color space adjustment to

         * perform. Valid values are defined in AccessibilityManager:

         * perform. Valid values are defined in AccessibilityManager and Settings arrays.xml:

         * - AccessibilityManager.DALTONIZER_DISABLED = -1

         * - AccessibilityManager.DALTONIZER_SIMULATE_MONOCHROMACY = 0

         * - AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY = 12

         * - <item>@string/daltonizer_mode_protanomaly</item> = 11

         * - AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY and

         *       <item>@string/daltonizer_mode_deuteranomaly</item> = 12

         * - <item>@string/daltonizer_mode_tritanomaly</item> = 13

         *

         * @hide

         */
@@ -6210,7 +6213,8 @@ public final class Settings { 
                "accessibility_display_daltonizer";



        private static final Validator ACCESSIBILITY_DISPLAY_DALTONIZER_VALIDATOR =

                new SettingsValidators.DiscreteValueValidator(new String[] {"-1", "0", "12"});

                new SettingsValidators.DiscreteValueValidator(

                        new String[] {"-1", "0", "11", "12", "13"});



        /**

         * Setting that specifies whether automatic click when the mouse pointer stops moving is