Add support for brightness Nits learning curve
To control the adaptive brightness using Device Health Service,
the brightness values are now converted to Nits to better support.
Initial values taken from LineageOS commit e156b7.
Issue: FP3-A11#388
Change-Id: I4248452b86316649e404f29cc3361e6c8cc5bf22
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d9cdbf8..2d950cf 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -123,7 +123,7 @@
<!-- Minimum screen brightness setting allowed by the power manager.
The user is forbidden from setting the brightness below this level. -->
- <integer name="config_screenBrightnessSettingMinimum">3</integer>
+ <integer name="config_screenBrightnessSettingMinimum">1</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 control points as follows:
@@ -146,32 +146,110 @@
Must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLevels">
+ <item>1</item>
+ <item>2</item>
<item>3</item>
- <item>6</item>
- <item>10</item>
- <item>30</item>
- <item>60</item>
- <item>100</item>
- <item>150</item>
- <item>210</item>
- <item>255</item>
+ <item>4</item>
+ <item>8</item>
+ <item>12</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>2981</item>
+ <item>5000</item>
</integer-array>
- <!-- Array of output values for LCD backlight corresponding to the LUX values
- in the config_autoBrightnessLevels array. This array should have size one greater
- than the size of the config_autoBrightnessLevels array.
- The brightness values must be between 0 and 255 and be non-decreasing.
- This must be overridden in platform specific overlays -->
- <integer-array name="config_autoBrightnessLcdBacklightValues">
- <item>3</item>
- <item>7</item>
- <item>10</item>
- <item>20</item>
- <item>40</item>
- <item>70</item>
- <item>110</item>
- <item>160</item>
- <item>200</item>
+ <!-- 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>27.0</item> <!-- 0-1 -->
+ <item>29.25559</item> <!-- 1-2 -->
+ <item>34.240692</item> <!-- 2-3 -->
+ <item>37.514347</item> <!-- 3-4 -->
+ <item>40.018696</item> <!-- 4-8 -->
+ <item>46.885098</item> <!-- 8-12 -->
+ <item>51.626434</item> <!-- 12-20 -->
+ <item>58.610405</item> <!-- 20-33 -->
+ <item>66.890915</item> <!-- 33-55 -->
+ <item>77.61644</item> <!-- 55-90 -->
+ <item>90.221886</item> <!-- 90-148 -->
+ <item>105.80314</item> <!-- 148-245 -->
+ <item>126.073845</item> <!-- 245-403 -->
+ <item>154.16931</item> <!-- 403-665 -->
+ <item>191.83717</item> <!-- 665-1097 -->
+ <item>240.74442</item> <!-- 1097-1808 -->
+ <item>294.84857</item> <!-- 1808-2981 -->
+ <item>348.05453</item> <!-- 2981-5000 -->
+ <item>389.70</item> <!-- 5000+ -->
+ </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>0</item>
+ <item>26.11</item>
+ <item>50.5</item>
+ <item>74.17</item>
+ <item>96.89</item>
+ <item>118.3</item>
+ <item>139.8</item>
+ <item>162.9</item>
+ <item>189.8</item>
+ <item>217.4</item>
+ <item>240.4</item>
+ <item>265.3</item>
+ <item>288.7</item>
+ <item>316</item>
+ <item>340.8</item>
+ <item>357.9</item>
+ <item>376.2</item>
+ <item>392.9</item>
+ </array>
+
+ <!-- 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>0</item>
+ <item>15</item>
+ <item>30</item>
+ <item>45</item>
+ <item>60</item>
+ <item>75</item>
+ <item>90</item>
+ <item>105</item>
+ <item>120</item>
+ <item>135</item>
+ <item>150</item>
+ <item>165</item>
+ <item>180</item>
+ <item>195</item>
+ <item>210</item>
+ <item>225</item>
+ <item>240</item>
<item>255</item>
</integer-array>