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

Merge "Permit all daltonizer settings to be restored" into pi-dev

Browse Source 
am: 33975d7a3b

Change-Id: I7a92c24887c0b9f50c43d20b606c74e4f9a3079e
This commit is contained in:
Phil Weaver
2018-03-10 02:55:34 +00:00
committed by android-build-merger
parent 23219d310f 33975d7a3b
commit a3d986be78
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6184,10 +6184,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
*/
@@ -6195,7 +6198,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