From 04cf15d289df651ff7436b87081a4fc798cc440b Mon Sep 17 00:00:00 2001
From: linpeter <linpeter@google.com>
Date: Thu, 18 Mar 2021 16:09:04 +0800
Subject: [PATCH] slider/whitefin/oriole/raven: remove redundant brightness
 config

This config_screenBrightnessNits/config_screenBrightnessBacklight are not used
when we have the displaydeviceconfig (ddc) exist in screenBrightnessMap.

Bug: 177140883
test: check brightness table
Change-Id: I7855602652a39288965e7510084d98d4d040312d
---
 .../base/core/res/res/values/config.xml       | 21 -------------------
 .../base/core/res/res/values/config.xml       | 21 -------------------
 .../base/core/res/res/values/config.xml       | 10 ---------
 .../base/core/res/res/values/config.xml       | 10 ---------
 4 files changed, 62 deletions(-)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 5bed6f0..a8a0167 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -37,27 +37,6 @@
          Must be in the range specified by minimum and maximum. -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
 
-    <!-- An array describing the screen's backlight values corresponding to the brightness
-         values in the config_screenBrightnessNits array.
-
-         This array should be equal in size to config_screenBrightnessBacklight. -->
-    <integer-array name="config_screenBrightnessBacklight">
-        <item>1</item>
-        <item>255</item>
-    </integer-array>
-
-    <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
-         values in the config_screenBrightnessBacklight array.  On OLED displays these  values
-         should be measured with an all white image while the display is in the fully on state.
-         Note that this value should *not* reflect the maximum brightness value for any high
-         brightness modes but only the maximum brightness value obtainable in a sustainable manner.
-
-         This array should be equal in size to config_screenBrightnessBacklight -->
-    <array name="config_screenBrightnessNits">
-        <item>2.0</item>
-        <item>500.0</item>
-    </array>
-
     <!-- Nonlinear coefficients for maximum panel brightness of 500 nits -->
     <string-array name="config_reduceBrightColorsCoefficientsNonlinear">
         <!-- a-coefficient --> <item>-0.4553233597</item>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index e734336..87a2410 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -86,27 +86,6 @@
          Must be in the range specified by minimum and maximum. -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
 
-    <!-- An array describing the screen's backlight values corresponding to the brightness
-         values in the config_screenBrightnessNits array.
-
-         This array should be equal in size to config_screenBrightnessBacklight. -->
-    <integer-array name="config_screenBrightnessBacklight">
-        <item>1</item>
-        <item>255</item>
-    </integer-array>
-
-    <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
-         values in the config_screenBrightnessBacklight array.  On OLED displays these  values
-         should be measured with an all white image while the display is in the fully on state.
-         Note that this value should *not* reflect the maximum brightness value for any high
-         brightness modes but only the maximum brightness value obtainable in a sustainable manner.
-
-         This array should be equal in size to config_screenBrightnessBacklight -->
-    <array name="config_screenBrightnessNits">
-        <item>2.0</item>
-        <item>500.0</item>
-    </array>
-
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]
diff --git a/slider/overlay/frameworks/base/core/res/res/values/config.xml b/slider/overlay/frameworks/base/core/res/res/values/config.xml
index e3b9dd7..77134c6 100644
--- a/slider/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/slider/overlay/frameworks/base/core/res/res/values/config.xml
@@ -29,14 +29,4 @@
     <!-- Default screen brightness setting
          Must be in the range specified by minimum and maximum. -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
-
-    <array name="config_screenBrightnessNits">
-        <item>2.0</item>
-        <item>500.0</item>
-    </array>
-
-    <integer-array name="config_screenBrightnessBacklight">
-        <item>1</item>
-        <item>255</item>
-    </integer-array>
 </resources>
diff --git a/whitefin/overlay/frameworks/base/core/res/res/values/config.xml b/whitefin/overlay/frameworks/base/core/res/res/values/config.xml
index c2052a6..78ff144 100644
--- a/whitefin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/whitefin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -30,11 +30,6 @@
          Must be in the range specified by minimum and maximum. -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
 
-    <array name="config_screenBrightnessNits">
-        <item>2.0</item>
-        <item>500.0</item>
-    </array>
-
     <!-- Nonlinear coefficients for maximum panel brightness of 500 nits -->
     <string-array name="config_reduceBrightColorsCoefficientsNonlinear">
         <!-- a-coefficient --> <item>-0.4553233597</item>
@@ -48,9 +43,4 @@
         <!-- b-coefficient --> <item>-0.96</item>
         <!-- y-intercept --> <item>1.0</item>
     </string-array>
-
-    <integer-array name="config_screenBrightnessBacklight">
-        <item>1</item>
-        <item>255</item>
-    </integer-array>
 </resources>