From 62e8c175257d25c64ed19e5ccccd4e3cd987b8ad Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 24 Oct 2017 21:37:34 +0100 Subject: [PATCH] Add color mode setting The new setting appears on devices that support color management and wide color gamut rendering. The setting allows the user to choose between natural (sRGB), boosted (sRGB + 10% saturation) and saturated (unmanaged colors; colors are remapped to the device's native gamut). This change adds a metric constant for analytics in Settings and uses a persistent system property to know when to suppress color management. Bug: 68159303 Test: manual Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813 --- proto/src/metrics_constants.proto | 5 +++++ services/core/java/com/android/server/wm/WindowManagerService.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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) { -- 2.11.0