From 72723c406526fdb905268d8a5d2d8674cd3ca26d Mon Sep 17 00:00:00 2001
From: Chris Lu <luchris@google.com>
Date: Thu, 16 May 2024 12:19:32 +0000
Subject: [PATCH 1/3] display: disable NS mode support

Bug: 316408428
Test: won't switch to NS mode
Change-Id: I85f6e26da07c1558b5530fb791dcf4657966ded0
---
 device-caiman.mk | 8 --------
 device-komodo.mk | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/device-caiman.mk b/device-caiman.mk
index b96947c7..5ce585d4 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -329,14 +329,6 @@ ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif
 
-# Display OP HZ Config
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.primarydisplay.op.hs_hz=120 \
-    vendor.primarydisplay.op.ns_hz=60 \
-    vendor.primarydisplay.op.ns_min_dbv=440 \
-    vendor.primarydisplay.op.hs_switch_min_dbv=1088 \
-    vendor.primarydisplay.op.hist_delta_th=8
-
 # Display fixed TE2
 PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120
 
diff --git a/device-komodo.mk b/device-komodo.mk
index 773a3d20..4ecc2c37 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -86,14 +86,6 @@ endif
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
 
-# Display OP HZ Config
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.primarydisplay.op.hs_hz=120 \
-    vendor.primarydisplay.op.ns_hz=60 \
-    vendor.primarydisplay.op.ns_min_dbv=440 \
-    vendor.primarydisplay.op.hs_switch_min_dbv=1088 \
-    vendor.primarydisplay.op.hist_delta_th=8
-
 # Display fixed TE2
 PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120
 

From 1d727a89358516b666c23cee41e77a9edc8f2d7f Mon Sep 17 00:00:00 2001
From: cweichun <cweichun@google.com>
Date: Fri, 17 May 2024 14:30:26 +0000
Subject: [PATCH 2/3] display: update new blocking zone

Bug: 337814575
Test: check blocking zone correctness
Change-Id: I9f5e1626506e465d64174a4cf825363cc697ba60
Merged-In: I9f5e1626506e465d64174a4cf825363cc697ba60
(cherry picked from commit db0a18aaa9b2f6d551e36ba59601220797c23589)
---
 device-caiman.mk | 2 +-
 device-komodo.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-caiman.mk b/device-caiman.mk
index 6f476040..c828faec 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -314,7 +314,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.preferred_mode=96
 
 ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1@202504:1.2@202404
-    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=5:120,:1
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=:1
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif
diff --git a/device-komodo.mk b/device-komodo.mk
index ed36179a..a7318723 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -79,7 +79,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.preferred_mode=10
 
 ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),)
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1@202504:1.2@202404
-    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=5:120,:1
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=:1
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif

From 2453abf3f33e183d62af9c1aee2be5e3afdd1668 Mon Sep 17 00:00:00 2001
From: Cathy Hsu <cathsu@google.com>
Date: Wed, 22 May 2024 03:49:50 +0000
Subject: [PATCH 3/3] display: update reduceBrightColorsStrength setting

Bug: 335669303
Test: dumpsys color_display
Change-Id: I5a670a2cfaf56074681daeddc5d2a77bc3bb9a74
---
 .../frameworks/base/core/res/res/values/config.xml       | 9 +++++++++
 .../frameworks/base/core/res/res/values/config.xml       | 9 +++++++++
 .../frameworks/base/core/res/res/values/config.xml       | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config.xml b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
index 8691001a..eecde36a 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
@@ -32,6 +32,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+     <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">50</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">75</integer>
+
     <!-- Minimum screen brightness setting allowed by power manager.
          The user is forbidden from setting the brightness below this level.  -->
     <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>
diff --git a/komodo/overlay/frameworks/base/core/res/res/values/config.xml b/komodo/overlay/frameworks/base/core/res/res/values/config.xml
index edcee7a4..9346c572 100644
--- a/komodo/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/komodo/overlay/frameworks/base/core/res/res/values/config.xml
@@ -32,6 +32,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+     <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">50</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">75</integer>
+
     <!-- Minimum screen brightness setting allowed by power manager.
          The user is forbidden from setting the brightness below this level.  -->
     <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>
diff --git a/tokay/overlay/frameworks/base/core/res/res/values/config.xml b/tokay/overlay/frameworks/base/core/res/res/values/config.xml
index ab6418a0..f4c33f2e 100644
--- a/tokay/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tokay/overlay/frameworks/base/core/res/res/values/config.xml
@@ -32,6 +32,15 @@
      <!-- Minimum screen brightness allowed by the power manager. -->
      <integer name="config_screenBrightnessDim">6</integer>
 
+     <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
+
      <!-- Minimum screen brightness setting allowed by power manager.
           The user is forbidden from setting the brightness below this level.  -->
      <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>