Merge "Check system support of wide-color" into oc-mr1-dev

am: e86bc950df

Change-Id: I166488d015cc7f8518fd3e3d1cc819fe23cc4ba3
This commit is contained in:
Courtney Goeltzenleuchter
2017-11-02 00:44:46 +00:00
committed by android-build-merger

View File

@@ -583,7 +583,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE); mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
mColorModePreference.updateCurrentAndSupported(); mColorModePreference.updateCurrentAndSupported();
if (mColorModePreference.getColorModeCount() < 2 || if (mColorModePreference.getColorModeCount() < 2 ||
getContext().getDisplay().isWideColorGamut()) { getContext().getResources().getConfiguration().isScreenWideColorGamut()) {
removePreference(KEY_COLOR_MODE); removePreference(KEY_COLOR_MODE);
mColorModePreference = null; mColorModePreference = null;
} }