diff options
| author | 2017-10-25 04:28:58 +0000 | |
|---|---|---|
| committer | 2017-10-25 04:28:58 +0000 | |
| commit | 19aa8ae955b3d923747d9f2edb8536ef5d948bb3 (patch) | |
| tree | 36035980048f73720b99cc373b82dd385897a53b | |
| parent | b13dc50d124cbacfe7a8f2fec3ede5c1bb620706 (diff) | |
| parent | 62e8c175257d25c64ed19e5ccccd4e3cd987b8ad (diff) | |
Merge "Add color mode setting" into oc-mr1-dev
| -rw-r--r-- | proto/src/metrics_constants.proto | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 48f3b9ce9fb0..81a23f0afa3f 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -4562,6 +4562,11 @@ message MetricsEvent { // 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 0abc84745f0e..f5cc43bd9019 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 @@ public class WindowManagerService extends IWindowManager.Stub } boolean hasWideColorGamutSupport() { - return mHasWideColorGamutSupport; + return mHasWideColorGamutSupport && + !SystemProperties.getBoolean("persist.sys.sf.native_mode", false); } void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) { |