From f13e716b6f09da57210932ccc524183a1a11269d Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 12 Oct 2018 21:49:35 +0200 Subject: [PATCH] Settings: Check if we have any color modes declared in overlay * Checking for wide gamut support isn't always enough Change-Id: Ic7257e37f2eca97450eaf0ca1e330de7596352be --- .../settings/display/ColorModePreferenceController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java index 2fa3452528b..311d86853ca 100644 --- a/src/com/android/settings/display/ColorModePreferenceController.java +++ b/src/com/android/settings/display/ColorModePreferenceController.java @@ -52,8 +52,11 @@ public class ColorModePreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { + final int[] availableColorModes = mContext.getResources().getIntArray( + com.android.internal.R.array.config_availableColorModes); return mContext.getSystemService(ColorDisplayManager.class) .isDeviceColorManaged() + && availableColorModes.length > 0 && !ColorDisplayManager.areAccessibilityTransformsEnabled(mContext) ? AVAILABLE : DISABLED_FOR_USER; }