commit bfc1cee888850b9f55cf42ffacb17a217381da9c
author android-build-team Robot <android-build-team-robot@google.com> Thu Nov 02 04:51:28 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 02 04:51:28 2017 +0000
tree c9ba9fd4072e429c61e5b2a9320b55cf171f1b26
parent 4f6263a527f2ec54049bb71aa370d1d128f7b166
parent d53173e6c42581a703d79eb11c7c9ec43d56ee82

Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098, 3156099, 3156100, 3156101, 3156102, 3158393, 3155699, 3155700, 3156195, 3156196, 3156019, 3156020, 3158394] into oc-mr1-release

Change-Id: I21ded79f3ace42dc5daff630682023cbb0792a18

src/com/android/settings/development/DevelopmentSettings.java

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index ae271ff..bfaed87 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -577,7 +577,7 @@
         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;
         }