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

This commit is contained in:
TreeHugger Robot
2017-11-02 00:40:07 +00:00
committed by Android (Google) Code Review

View File

@@ -577,7 +577,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;
} }