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

Merge "Simplify color mode mapping" into tm-dev

Browse Source
This commit is contained in:
Christine Franks
2022-05-13 18:21:28 +00:00
committed by Android (Google) Code Review
parent 6953052d83 c5df8d22e8
commit b7715733a0
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/display/color/ColorDisplayService.java
View File

@@ -948,19 +948,15 @@ public final class ColorDisplayService extends SystemService {
if (!isColorModeAvailable(colorMode)) { if (!isColorModeAvailable(colorMode)) {
final int[] mappedColorModes = getContext().getResources().getIntArray( final int[] mappedColorModes = getContext().getResources().getIntArray(
R.array.config_mappedColorModes); R.array.config_mappedColorModes);
if (colorMode == COLOR_MODE_BOOSTED && mappedColorModes.length > COLOR_MODE_NATURAL if (colorMode != -1 && mappedColorModes.length > colorMode
&& isColorModeAvailable(mappedColorModes[COLOR_MODE_NATURAL])) { && isColorModeAvailable(mappedColorModes[colorMode])) {
colorMode = COLOR_MODE_NATURAL; colorMode = mappedColorModes[colorMode];
} else if (colorMode == COLOR_MODE_SATURATED
&& mappedColorModes.length > COLOR_MODE_AUTOMATIC
&& isColorModeAvailable(mappedColorModes[COLOR_MODE_AUTOMATIC])) {
colorMode = COLOR_MODE_AUTOMATIC;
} else if (colorMode == COLOR_MODE_AUTOMATIC
&& mappedColorModes.length > COLOR_MODE_SATURATED
&& isColorModeAvailable(mappedColorModes[COLOR_MODE_SATURATED])) {
colorMode = COLOR_MODE_SATURATED;
} else { } else {
colorMode = -1; final int[] availableColorModes = getContext().getResources().getIntArray(
R.array.config_availableColorModes);
if (availableColorModes.length > 0) {
colorMode = availableColorModes[0];
}
} }
} }