diff options
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/color/ColorDisplayService.java | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 4c6ae812f1ee..3bee89d10706 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1094,6 +1094,11 @@ --> </integer-array> + <!-- Color mode to use when accessibility transforms are enabled. This color mode must be + supported by the device, but not necessarily appear in config_availableColorModes. The + regularly selected color mode will be used if this value is negative. --> + <integer name="config_accessibilityColorMode">-1</integer> + <!-- Indicate whether to allow the device to suspend when the screen is off due to the proximity sensor. This resource should only be set to true if the sensor HAL correctly handles the proximity sensor as a wake-up source. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 29181c871d1b..78fd3519ea02 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3185,6 +3185,7 @@ <java-symbol type="array" name="config_nightDisplayColorTemperatureCoefficients" /> <java-symbol type="array" name="config_nightDisplayColorTemperatureCoefficientsNative" /> <java-symbol type="array" name="config_availableColorModes" /> + <java-symbol type="integer" name="config_accessibilityColorMode" /> <java-symbol type="bool" name="config_displayWhiteBalanceAvailable" /> <java-symbol type="bool" name="config_displayWhiteBalanceEnabledDefault" /> <java-symbol type="integer" name="config_displayWhiteBalanceColorTemperatureMin" /> diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java index 85fb1e0f4bdf..ad81ca2ec2b1 100644 --- a/services/core/java/com/android/server/display/color/ColorDisplayService.java +++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java @@ -775,10 +775,10 @@ public final class ColorDisplayService extends SystemService { final ContentResolver cr = getContext().getContentResolver(); if (isAccessibilityEnabled()) { // There are restrictions on the available color modes combined with a11y transforms. - if (isColorModeAvailable(COLOR_MODE_SATURATED)) { - return COLOR_MODE_SATURATED; - } else if (isColorModeAvailable(COLOR_MODE_AUTOMATIC)) { - return COLOR_MODE_AUTOMATIC; + final int a11yColorMode = getContext().getResources().getInteger( + R.integer.config_accessibilityColorMode); + if (a11yColorMode >= 0) { + return a11yColorMode; } } |