Check system support of wide-color

getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.

Bug: 64801219
Bug: 67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.

Change-Id: If28e52da174dd460850bc84744818979f52add78
(cherry picked from commit bae1b24ba306793ca2d86aa80552bd79e0e54742)
(cherry picked from commit 66e4dac39360cc190011455060edbbaf42bef74b)

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index ae271ff..bfaed87 100644 (file)
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -577,7 +577,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
         mColorModePreference.updateCurrentAndSupported();
         if (mColorModePreference.getColorModeCount() < 2 ||
-                getContext().getDisplay().isWideColorGamut()) {
+                getContext().getResources().getConfiguration().isScreenWideColorGamut()) {
             removePreference(KEY_COLOR_MODE);
             mColorModePreference = null;
         }