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
Merged-In: I83cc972fc3a2290ff106eae0e76a3ee799503813
Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813
(cherry picked from commit 62e8c17525)
This commit is contained in:
Romain Guy
2017-10-24 21:37:34 +01:00
committed by Chia-I Wu
parent 25c008d9b1
commit af5e11245d
2 changed files with 7 additions and 1 deletions

View File

@@ -4219,6 +4219,11 @@ message MetricsEvent {
// OS: O DR
TRAMPOLINE_SETTINGS_EVENT = 1033;
// OPEN: Settings > Display > Colors
// CATEGORY: SETTINGS
// OS: O MR (backported for O DR)
COLOR_MODE_SETTINGS = 1143;
// ---- End O-DR1 Constants, all O-DR1 constants go above this line ----
// Add new aosp constants above this line.

View File

@@ -7670,7 +7670,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) {