| commit | 51c2848c449a322afc3977f4918a84b40b0a734e | [log] [tgz] |
|---|---|---|
| author | Chia-I Wu <olv@google.com> | Wed Oct 25 04:38:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 25 04:38:29 2017 +0000 |
| tree | ad9e1270321e71a1c0578a15b7a9efc8f42432ad | |
| parent | fd05e9a0750e9658989f49fbf51fd1fefbe466b3 [diff] | |
| parent | 19aa8ae955b3d923747d9f2edb8536ef5d948bb3 [diff] |
Merge "Add color mode setting" into oc-mr1-dev am: 19aa8ae955 Change-Id: I99821d20c99ae46537640cde4418c9079a46f6f1
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 48f3b9c..81a23f0 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 ---- // Add new aosp constants above this line.
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 0abc847..f5cc43b 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7673,7 +7673,8 @@ } boolean hasWideColorGamutSupport() { - return mHasWideColorGamutSupport; + return mHasWideColorGamutSupport && + !SystemProperties.getBoolean("persist.sys.sf.native_mode", false); } void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {