commit 8b3152c37a73ee0fca6292f74954204366d73dfe
author Chia-I Wu <olv@google.com> Wed Oct 25 04:54:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 25 04:54:24 2017 +0000
tree c5d985327b46fb4ae4e88b4f3f7f53e3bf91d4a4
parent 998d84a0d9ebf61f001232a2a3675bbaed7d0f50
parent 51c2848c449a322afc3977f4918a84b40b0a734e

Merge "Add color mode setting" into oc-mr1-dev am: 19aa8ae955
am: 51c2848c44

Change-Id: I97fb37429e97c59b223a36431f59c43c86c92ab0

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 8e88359..5dd3620 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -4562,6 +4562,11 @@
     // OS: O MR
     NOTIFICATION_SNOOZE_OPTIONS = 1142;
 
+    // OPEN: Settings > Display > Colors
+    // CATEGORY: SETTINGS
+    // OS: O MR
+    COLOR_MODE_SETTINGS = 1143;
+
     // ---- End O-MR1 Constants, all O-MR1 constants go above this line ----
 
     // OPEN: Settings > Network & Internet > Mobile network

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index f0da474..5992a5f 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7702,7 +7702,8 @@
     }
 
     boolean hasWideColorGamutSupport() {
-        return mHasWideColorGamutSupport;
+        return mHasWideColorGamutSupport &&
+                !SystemProperties.getBoolean("persist.sys.sf.native_mode", false);
     }
 
     void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {