From 798b78c656b5542789ddaf83bc6e02285e797a29 Mon Sep 17 00:00:00 2001
From: Daniel Solomon <solomondaniel@google.com>
Date: Thu, 11 Jul 2019 19:16:24 -0700
Subject: [PATCH] sm7250-common: Add config for display composition color
 spaces

 * Currently we use the Display-P3 color space for display composition
   across all color modes on op8. We do this to facilitate a new version
   of Adaptive color mode; this forces display to always use P3 color
   calibration.

 * It turns out that in op8's case using P3 color calibration for sRGB
   content, even when the content is accurately converted to P3, degrades
   color accuracy for certain sRGB colors. To fix this, we revert back to
   pre-op8 behavior, where we let SurfaceFlinger choose the most
   appropriate color space for composition, for all color modes used on op8
   *except* for Adaptive color mode.

Bug: 137140317
Bug: 137053654
Change-Id: I8670f76aa8c7c513e5a6db291c970a20609d032d
---
 .../base/core/res/res/values/config.xml       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 63ba94f..d9d27dc 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -327,4 +327,28 @@
         <item>2</item> <!-- COLOR_MODE_SATURATED -->
         <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
     </integer-array>
+
+    <!-- The following two arrays specify which color space to use for display composition when a
+         certain color mode is active.
+         Composition color spaces are defined in android.view.Display.COLOR_MODE_xxx, and color
+         modes are defined in ColorDisplayManager.COLOR_MODE_xxx and
+         ColorDisplayManager.VENDOR_COLOR_MODE_xxx.
+         The color space COLOR_MODE_DEFAULT (0) lets the system select the most appropriate
+         composition color space for currently displayed content. Other values (e.g.,
+         COLOR_MODE_SRGB) override system selection; these other color spaces must be supported by
+         the device for for display composition.
+         If a color mode does not have a corresponding color space specified in this array, the
+         currently set composition color space will not be modified.-->
+    <integer-array name="config_displayCompositionColorModes">
+        <item>0</item> <!-- COLOR_MODE_NATURAL   -->
+        <item>1</item> <!-- COLOR_MODE_BOOSTED   -->
+        <item>2</item> <!-- COLOR_MODE_SATURATED -->
+        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
+    </integer-array>
+    <integer-array name="config_displayCompositionColorSpaces">
+        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
+        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
+        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
+        <item>9</item> <!-- COLOR_MODE_DISPLAY_P3 -->
+    </integer-array>
 </resources>