Merge "Check system support of wide-color"

This commit is contained in:
TreeHugger Robot
2017-10-12 18:37:37 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

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

View File

@@ -91,7 +91,7 @@ public class PictureColorModePreferenceController extends
@VisibleForTesting
boolean isWideColorGamut() {
return mContext.getDisplay().isWideColorGamut();
return mContext.getResources().getConfiguration().isScreenWideColorGamut();
}
@VisibleForTesting