From c943ce1aaa2e13f3c450880037ad9e406519f223 Mon Sep 17 00:00:00 2001
From: sallyyuen <sallyyuen@google.com>
Date: Thu, 25 Mar 2021 13:17:02 -0700
Subject: [PATCH] Set min, max, and default RBC strength values

Test: Manual testing, adb shell commands
atest FrameworksServicesTests:ReduceBrightColorsTintControllerTest
and atest FrameworksServicesTests:ColorDisplayServiceTest
Bug: 179805222
Change-Id: I4b182d9f46c42fc18594519200443e9fce8d5469
---
 core/res/res/values/config.xml                            | 6 +++---
 .../android/server/display/color/ColorDisplayService.java | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index f6fee880bf2fc..11425c126343e 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -828,13 +828,13 @@
     </string-array>
 
     <!-- Default strength, in percentage, of bright color reduction when activated. -->
-    <integer name="config_reduceBrightColorsStrengthDefault">0</integer>
+    <integer name="config_reduceBrightColorsStrengthDefault">50</integer>
 
     <!-- Minimum strength, in percentage, supported by bright color reduction. -->
-    <integer name="config_reduceBrightColorsStrengthMin">0</integer>
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
 
     <!-- Maximum strength, in percentage, supported by bright color reduction. -->
-    <integer name="config_reduceBrightColorsStrengthMax">100</integer>
+    <integer name="config_reduceBrightColorsStrengthMax">90</integer>
 
     <!-- Boolean indicating whether display white balance is supported. -->
     <bool name="config_displayWhiteBalanceAvailable">false</bool>
diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java
index 88b26680631e8..7fa0b21d166f5 100644
--- a/services/core/java/com/android/server/display/color/ColorDisplayService.java
+++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java
@@ -630,8 +630,12 @@ public final class ColorDisplayService extends SystemService {
         if (mCurrentUser == UserHandle.USER_NULL) {
             return;
         }
-        final int strength = Secure.getIntForUser(getContext().getContentResolver(),
-                Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0, mCurrentUser);
+        int strength = Secure.getIntForUser(getContext().getContentResolver(),
+                Secure.REDUCE_BRIGHT_COLORS_LEVEL, NOT_SET, mCurrentUser);
+        if (strength == NOT_SET) {
+            strength = getContext().getResources().getInteger(
+                    R.integer.config_reduceBrightColorsStrengthDefault);
+        }
         mReduceBrightColorsTintController.setMatrix(strength);
         if (mReduceBrightColorsListener != null) {
             mReduceBrightColorsListener.onReduceBrightColorsStrengthChanged(strength);