From 62e0f564ff8aa630f1ba65d8e6d3ec6894490b7c Mon Sep 17 00:00:00 2001
From: derickhong <derickhong@google.com>
Date: Thu, 18 Jan 2024 15:38:38 +0800
Subject: [PATCH] display: cm4/km4/tk4: update Adaptive Brightness Curve

remove config "config_autoBrightnessDisplayValuesNits"

Bug: 298738593
Test: adb shell dumpsys display | grep mBrightnessLevelsNits
Change-Id: I481b63dae26c48d2ff7265eb633166000f53d6a7
Signed-off-by: derickhong <derickhong@google.com>
---
 .../base/core/res/res/values/config.xml       | 92 -------------------
 .../base/core/res/res/values/config.xml       | 92 -------------------
 .../base/core/res/res/values/config.xml       | 92 -------------------
 3 files changed, 276 deletions(-)

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 81fb8fe8..b979ecf0 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
@@ -67,98 +67,6 @@
     <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
     <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
 
-    <!-- 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]
-         Zone 1:        array[0] <= LUX < array[1]
-         ...
-         Zone N:        array[N - 1] <= LUX < array[N]
-         Zone N + 1     array[N] <= LUX < infinity
-         Must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLevels">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>8</item>
-        <item>12</item>
-        <item>15</item>
-        <item>20</item>
-        <item>33</item>
-        <item>55</item>
-        <item>90</item>
-        <item>148</item>
-        <item>245</item>
-        <item>403</item>
-        <item>665</item>
-        <item>1097</item>
-        <item>1808</item>
-        <item>3000</item>
-        <item>6000</item>
-        <item>9000</item>
-        <item>10000</item>
-        <item>14000</item>
-        <item>20000</item>
-        <item>25000</item>
-        <item>31000</item>
-        <item>41000</item>
-        <item>51000</item>
-        <item>61000</item>
-        <item>71000</item>
-        <item>81000</item>
-        <item>91000</item>
-        <item>100000</item>
-    </integer-array>
-
-    <!-- Array of desired screen brightness in nits corresponding to the lux values
-      in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
-      config_screenBrightnessMaximumNits, the display brightness is defined as the measured
-      brightness of an all-white image.
-
-      If this is defined then:
-      - config_autoBrightnessLcdBacklightValues should not be defined
-      - config_screenBrightnessNits must be defined
-      - config_screenBrightnessBacklight must be defined
-
-      This array should have size one greater than the size of the config_autoBrightnessLevels
-      array. The brightness values must be non-negative and non-decreasing. This must be
-      overridden in platform specific overlays -->
-    <array name="config_autoBrightnessDisplayValuesNits">
-        <item>5.139055</item>      <!--  0 - 1 -->
-        <item>9.962018965</item>   <!--  1 - 2 -->
-        <item>18.34822964</item>   <!--  2 - 3 -->
-        <item>21.55068128</item>   <!--  3 - 4 -->
-        <item>24.0167788</item>    <!--  4 - 8 -->
-        <item>32.5</item>          <!--  8 - 12 -->
-        <item>46</item>            <!--  12 - 15 -->
-        <item>53.26923077</item>   <!--  15 - 20 -->
-        <item>54.61538462</item>   <!--  20 - 33 -->
-        <item>58.11538462</item>   <!--  33 - 55 -->
-        <item>62.1394</item>       <!--  55 - 90 -->
-        <item>67.13133333</item>   <!--  90 - 148 -->
-        <item>79.67614115</item>   <!--  148 - 245 -->
-        <item>98.04727274</item>   <!--  245 - 403 -->
-        <item>125.1221991</item>   <!--  403 - 665 -->
-        <item>161.6875093</item>   <!--  665 - 1097 -->
-        <item>208.4885553</item>   <!--  1097 - 1808 -->
-        <item>264.8221315</item>   <!--  1808 - 3000 -->
-        <item>328.5869521</item>   <!--  3000 - 6000 -->
-        <item>627.4315413</item>   <!--  6000 - 9000 -->
-        <item>826.8584866</item>   <!--  9000 - 10000 -->
-        <item>867.85582302</item>  <!-- 10000 - 14000 -->
-        <item>1041.39662279</item> <!-- 14000 - 20000 -->
-        <item>1227.52633489</item> <!-- 20000 - 25000 -->
-        <item>1331.28933608</item> <!-- 25000 - 31000 -->
-        <item>1428.421149</item>   <!-- 31000 - 41000 -->
-        <item>1575.787970</item>   <!-- 41000 - 51000 -->
-        <item>1703.973078</item>   <!-- 51000 - 61000 -->
-        <item>1811.651453</item>   <!-- 61000 - 71000 -->
-        <item>1897.082235</item>   <!-- 71000 - 81000 -->
-        <item>1958.157391</item>   <!-- 81000 - 91000 -->
-        <item>1992.433376</item>   <!-- 91000 - 100000 -->
-        <item>2000</item>          <!-- 100000+  -->
-    </array>
-
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
          for debouncing the light sensor.  Different constants are used to debounce the light sensor
          when adapting to brighter or darker environments.  This parameter controls how quickly
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 090b94fa..59e59399 100644
--- a/komodo/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/komodo/overlay/frameworks/base/core/res/res/values/config.xml
@@ -67,98 +67,6 @@
     <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
     <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
 
-    <!-- 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]
-         Zone 1:        array[0] <= LUX < array[1]
-         ...
-         Zone N:        array[N - 1] <= LUX < array[N]
-         Zone N + 1     array[N] <= LUX < infinity
-         Must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLevels">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>8</item>
-        <item>12</item>
-        <item>15</item>
-        <item>20</item>
-        <item>33</item>
-        <item>55</item>
-        <item>90</item>
-        <item>148</item>
-        <item>245</item>
-        <item>403</item>
-        <item>665</item>
-        <item>1097</item>
-        <item>1808</item>
-        <item>3000</item>
-        <item>6000</item>
-        <item>9000</item>
-        <item>10000</item>
-        <item>14000</item>
-        <item>20000</item>
-        <item>25000</item>
-        <item>31000</item>
-        <item>41000</item>
-        <item>51000</item>
-        <item>61000</item>
-        <item>71000</item>
-        <item>81000</item>
-        <item>91000</item>
-        <item>100000</item>
-    </integer-array>
-
-    <!-- Array of desired screen brightness in nits corresponding to the lux values
-      in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
-      config_screenBrightnessMaximumNits, the display brightness is defined as the measured
-      brightness of an all-white image.
-
-      If this is defined then:
-      - config_autoBrightnessLcdBacklightValues should not be defined
-      - config_screenBrightnessNits must be defined
-      - config_screenBrightnessBacklight must be defined
-
-      This array should have size one greater than the size of the config_autoBrightnessLevels
-      array. The brightness values must be non-negative and non-decreasing. This must be
-      overridden in platform specific overlays -->
-    <array name="config_autoBrightnessDisplayValuesNits">
-        <item>5.139055</item>      <!--  0 - 1 -->
-        <item>9.962018965</item>   <!--  1 - 2 -->
-        <item>18.34822964</item>   <!--  2 - 3 -->
-        <item>21.55068128</item>   <!--  3 - 4 -->
-        <item>24.0167788</item>    <!--  4 - 8 -->
-        <item>32.5</item>          <!--  8 - 12 -->
-        <item>46</item>            <!--  12 - 15 -->
-        <item>53.26923077</item>   <!--  15 - 20 -->
-        <item>54.61538462</item>   <!--  20 - 33 -->
-        <item>58.11538462</item>   <!--  33 - 55 -->
-        <item>62.1394</item>       <!--  55 - 90 -->
-        <item>67.13133333</item>   <!--  90 - 148 -->
-        <item>79.67614115</item>   <!--  148 - 245 -->
-        <item>98.04727274</item>   <!--  245 - 403 -->
-        <item>125.1221991</item>   <!--  403 - 665 -->
-        <item>161.6875093</item>   <!--  665 - 1097 -->
-        <item>208.4885553</item>   <!--  1097 - 1808 -->
-        <item>264.8221315</item>   <!--  1808 - 3000 -->
-        <item>328.5869521</item>   <!--  3000 - 6000 -->
-        <item>627.4315413</item>   <!--  6000 - 9000 -->
-        <item>826.8584866</item>   <!--  9000 - 10000 -->
-        <item>867.85582302</item>  <!-- 10000 - 14000 -->
-        <item>1041.39662279</item> <!-- 14000 - 20000 -->
-        <item>1227.52633489</item> <!-- 20000 - 25000 -->
-        <item>1331.28933608</item> <!-- 25000 - 31000 -->
-        <item>1428.421149</item>   <!-- 31000 - 41000 -->
-        <item>1575.787970</item>   <!-- 41000 - 51000 -->
-        <item>1703.973078</item>   <!-- 51000 - 61000 -->
-        <item>1811.651453</item>   <!-- 61000 - 71000 -->
-        <item>1897.082235</item>   <!-- 71000 - 81000 -->
-        <item>1958.157391</item>   <!-- 81000 - 91000 -->
-        <item>1992.433376</item>   <!-- 91000 - 100000 -->
-        <item>2000</item>          <!-- 100000+  -->
-    </array>
-
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
          for debouncing the light sensor.  Different constants are used to debounce the light sensor
          when adapting to brighter or darker environments.  This parameter controls how quickly
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 9432792a..b3c4a530 100644
--- a/tokay/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tokay/overlay/frameworks/base/core/res/res/values/config.xml
@@ -52,98 +52,6 @@
      <!-- The default peak refresh rate. -->
      <integer name="config_defaultPeakRefreshRate">60</integer>
 
-     <!-- 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]
-          Zone 1:        array[0] <= LUX < array[1]
-          ...
-          Zone N:        array[N - 1] <= LUX < array[N]
-          Zone N + 1     array[N] <= LUX < infinity
-          Must be overridden in platform specific overlays -->
-     <integer-array name="config_autoBrightnessLevels">
-          <item>1</item>
-          <item>2</item>
-          <item>3</item>
-          <item>4</item>
-          <item>8</item>
-          <item>12</item>
-          <item>15</item>
-          <item>20</item>
-          <item>33</item>
-          <item>55</item>
-          <item>90</item>
-          <item>148</item>
-          <item>245</item>
-          <item>403</item>
-          <item>665</item>
-          <item>1097</item>
-          <item>1808</item>
-          <item>3000</item>
-          <item>6000</item>
-          <item>9000</item>
-          <item>10000</item>
-          <item>14000</item>
-          <item>20000</item>
-          <item>25000</item>
-          <item>31000</item>
-          <item>41000</item>
-          <item>51000</item>
-          <item>61000</item>
-          <item>71000</item>
-          <item>81000</item>
-          <item>91000</item>
-          <item>100000</item>
-     </integer-array>
-
-     <!-- Array of desired screen brightness in nits corresponding to the lux values
-       in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
-       config_screenBrightnessMaximumNits, the display brightness is defined as the measured
-       brightness of an all-white image.
-
-       If this is defined then:
-       - config_autoBrightnessLcdBacklightValues should not be defined
-       - config_screenBrightnessNits must be defined
-       - config_screenBrightnessBacklight must be defined
-
-       This array should have size one greater than the size of the config_autoBrightnessLevels
-       array. The brightness values must be non-negative and non-decreasing. This must be
-       overridden in platform specific overlays -->
-     <array name="config_autoBrightnessDisplayValuesNits">
-          <item>5.139055</item>      <!--  0 - 1 -->
-          <item>9.962018965</item>   <!--  1 - 2 -->
-          <item>18.34822964</item>   <!--  2 - 3 -->
-          <item>21.55068128</item>   <!--  3 - 4 -->
-          <item>24.0167788</item>    <!--  4 - 8 -->
-          <item>32.5</item>          <!--  8 - 12 -->
-          <item>46</item>            <!--  12 - 15 -->
-          <item>53.26923077</item>   <!--  15 - 20 -->
-          <item>54.61538462</item>   <!--  20 - 33 -->
-          <item>58.11538462</item>   <!--  33 - 55 -->
-          <item>62.1394</item>       <!--  55 - 90 -->
-          <item>67.13133333</item>   <!--  90 - 148 -->
-          <item>79.67614115</item>   <!--  148 - 245 -->
-          <item>98.04727274</item>   <!--  245 - 403 -->
-          <item>125.1221991</item>   <!--  403 - 665 -->
-          <item>161.6875093</item>   <!--  665 - 1097 -->
-          <item>208.4885553</item>   <!--  1097 - 1808 -->
-          <item>264.8221315</item>   <!--  1808 - 3000 -->
-          <item>328.5869521</item>   <!--  3000 - 6000 -->
-          <item>627.4315413</item>   <!--  6000 - 9000 -->
-          <item>826.8584866</item>   <!--  9000 - 10000 -->
-          <item>867.85582302</item>  <!-- 10000 - 14000 -->
-          <item>1041.39662279</item> <!-- 14000 - 20000 -->
-          <item>1227.52633489</item> <!-- 20000 - 25000 -->
-          <item>1331.28933608</item> <!-- 25000 - 31000 -->
-          <item>1428.421149</item>   <!-- 31000 - 41000 -->
-          <item>1575.787970</item>   <!-- 41000 - 51000 -->
-          <item>1703.973078</item>   <!-- 51000 - 61000 -->
-          <item>1811.651453</item>   <!-- 61000 - 71000 -->
-          <item>1897.082235</item>   <!-- 71000 - 81000 -->
-          <item>1958.157391</item>   <!-- 81000 - 91000 -->
-          <item>1992.433376</item>   <!-- 91000 - 100000 -->
-          <item>2000</item>          <!-- 100000+  -->
-     </array>
-
      <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
           for debouncing the light sensor.  Different constants are used to debounce the light sensor
           when adapting to brighter or darker environments.  This parameter controls how quickly