Merge changes I6e86551d,I23f16d86,If97c9d03,I85412cd4 into main
* changes: display: cm4: add initial adaptive brightness table and parameters display: km4: add initial adaptive brightness table and parameters display: cm4: set default brightness display: km4: set default brightness
This commit is contained in:
Jeremy DeHaan
Android (Google) Code Review
commit
8d6124e266
2 changed files with 292 additions and 258 deletions
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
<!-- Flag indicating whether the we should enable the automatic brightness in Settings.
|
||||
Software implementation will be used if config_hardware_auto_brightness_available is not set -->
|
||||
<bool name="config_automatic_brightness_available">false</bool>
|
||||
<bool name="config_automatic_brightness_available">true</bool>
|
||||
|
||||
<!-- Minimum screen brightness allowed by the power manager. -->
|
||||
<integer name="config_screenBrightnessDim">6</integer>
|
||||
|
|
@ -42,7 +42,8 @@
|
|||
|
||||
<!-- Default screen brightness setting
|
||||
Must be in the range specified by minimum and maximum. -->
|
||||
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.17429718</item>
|
||||
<!-- 140 nits: (140-2)/(1250-2)*(0.68-0.0)+0.0 = 0.075192308 -->
|
||||
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.075192308</item>
|
||||
|
||||
<!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
|
||||
this value to 0 so it has no effect. -->
|
||||
|
|
@ -75,26 +76,34 @@
|
|||
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>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>
|
||||
<item>10000</item>
|
||||
<item>20000</item>
|
||||
<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>51000</item>
|
||||
<item>81000</item>
|
||||
<item>100000</item>
|
||||
</integer-array>
|
||||
|
||||
<!-- Array of desired screen brightness in nits corresponding to the lux values
|
||||
|
|
@ -111,27 +120,35 @@
|
|||
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>30.62162162</item> <!-- 8 - 12 -->
|
||||
<item>35.09486396</item> <!-- 12 - 20 -->
|
||||
<item>41.2249643</item> <!-- 20 - 33 -->
|
||||
<item>47.6760716</item> <!-- 33 - 55 -->
|
||||
<item>55.73002427</item> <!-- 55 - 90 -->
|
||||
<item>66.24126116</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 - 2981 -->
|
||||
<item>327.8974352</item> <!-- 2981 - 5000 -->
|
||||
<item>401.1676739</item> <!-- 5000 - 10000 -->
|
||||
<item>750.0</item> <!-- 10000 - 20000 -->
|
||||
<item>900.0</item> <!-- 20000+ -->
|
||||
<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>1414.57566867</item> <!-- 31000 - 51000 -->
|
||||
<item>1553.22826182</item> <!-- 51000 - 81000 -->
|
||||
<item>1614.01031782</item> <!-- 81000 - 100000 -->
|
||||
<item>1850</item> <!-- 100000+ -->
|
||||
</array>
|
||||
|
||||
<!-- Stability requirements in milliseconds for accepting a new brightness level. This is used
|
||||
|
|
@ -142,94 +159,94 @@
|
|||
<integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
|
||||
<integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
|
||||
|
||||
<integer-array name="config_ambientThresholdLevels">
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
<item>5</item>
|
||||
<item>6</item>
|
||||
<item>7</item>
|
||||
<item>8</item>
|
||||
<item>9</item>
|
||||
<item>10</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
<item>40</item>
|
||||
<item>50</item>
|
||||
<item>60</item>
|
||||
<item>70</item>
|
||||
<item>80</item>
|
||||
<item>90</item>
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>300</item>
|
||||
<item>400</item>
|
||||
<item>500</item>
|
||||
<item>1000</item>
|
||||
<item>2000</item>
|
||||
<item>3000</item>
|
||||
<item>4000</item>
|
||||
</integer-array>
|
||||
<integer-array name="config_ambientThresholdLevels">
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
<item>5</item>
|
||||
<item>6</item>
|
||||
<item>7</item>
|
||||
<item>8</item>
|
||||
<item>9</item>
|
||||
<item>10</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
<item>40</item>
|
||||
<item>50</item>
|
||||
<item>60</item>
|
||||
<item>70</item>
|
||||
<item>80</item>
|
||||
<item>90</item>
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>300</item>
|
||||
<item>400</item>
|
||||
<item>500</item>
|
||||
<item>1000</item>
|
||||
<item>2000</item>
|
||||
<item>3000</item>
|
||||
<item>4000</item>
|
||||
</integer-array>
|
||||
|
||||
<integer-array name="config_ambientBrighteningThresholds">
|
||||
<item>5186</item>
|
||||
<item>4333</item>
|
||||
<item>3666</item>
|
||||
<item>2999</item>
|
||||
<item>2759</item>
|
||||
<item>2519</item>
|
||||
<item>2279</item>
|
||||
<item>2039</item>
|
||||
<item>1799</item>
|
||||
<item>799</item>
|
||||
<item>527</item>
|
||||
<item>499</item>
|
||||
<item>470</item>
|
||||
<item>517</item>
|
||||
<item>565</item>
|
||||
<item>612</item>
|
||||
<item>660</item>
|
||||
<item>708</item>
|
||||
<item>742</item>
|
||||
<item>636</item>
|
||||
<item>582</item>
|
||||
<item>549</item>
|
||||
<item>369</item>
|
||||
<item>294</item>
|
||||
<item>269</item>
|
||||
<item>220</item>
|
||||
<item>220</item>
|
||||
</integer-array>
|
||||
<integer-array name="config_ambientBrighteningThresholds">
|
||||
<item>5186</item>
|
||||
<item>4333</item>
|
||||
<item>3666</item>
|
||||
<item>2999</item>
|
||||
<item>2759</item>
|
||||
<item>2519</item>
|
||||
<item>2279</item>
|
||||
<item>2039</item>
|
||||
<item>1799</item>
|
||||
<item>799</item>
|
||||
<item>527</item>
|
||||
<item>499</item>
|
||||
<item>470</item>
|
||||
<item>517</item>
|
||||
<item>565</item>
|
||||
<item>612</item>
|
||||
<item>660</item>
|
||||
<item>708</item>
|
||||
<item>742</item>
|
||||
<item>636</item>
|
||||
<item>582</item>
|
||||
<item>549</item>
|
||||
<item>369</item>
|
||||
<item>294</item>
|
||||
<item>269</item>
|
||||
<item>220</item>
|
||||
<item>220</item>
|
||||
</integer-array>
|
||||
|
||||
<integer-array name="config_ambientDarkeningThresholds">
|
||||
<item>525</item>
|
||||
<item>683</item>
|
||||
<item>666</item>
|
||||
<item>650</item>
|
||||
<item>640</item>
|
||||
<item>630</item>
|
||||
<item>620</item>
|
||||
<item>610</item>
|
||||
<item>600</item>
|
||||
<item>500</item>
|
||||
<item>500</item>
|
||||
<item>440</item>
|
||||
<item>385</item>
|
||||
<item>382</item>
|
||||
<item>379</item>
|
||||
<item>376</item>
|
||||
<item>373</item>
|
||||
<item>371</item>
|
||||
<item>367</item>
|
||||
<item>387</item>
|
||||
<item>397</item>
|
||||
<item>403</item>
|
||||
<item>380</item>
|
||||
<item>345</item>
|
||||
<item>333</item>
|
||||
<item>283</item>
|
||||
<item>283</item>
|
||||
</integer-array>
|
||||
<integer-array name="config_ambientDarkeningThresholds">
|
||||
<item>525</item>
|
||||
<item>683</item>
|
||||
<item>666</item>
|
||||
<item>650</item>
|
||||
<item>640</item>
|
||||
<item>630</item>
|
||||
<item>620</item>
|
||||
<item>610</item>
|
||||
<item>600</item>
|
||||
<item>500</item>
|
||||
<item>500</item>
|
||||
<item>440</item>
|
||||
<item>385</item>
|
||||
<item>382</item>
|
||||
<item>379</item>
|
||||
<item>376</item>
|
||||
<item>373</item>
|
||||
<item>371</item>
|
||||
<item>367</item>
|
||||
<item>387</item>
|
||||
<item>397</item>
|
||||
<item>403</item>
|
||||
<item>380</item>
|
||||
<item>345</item>
|
||||
<item>333</item>
|
||||
<item>283</item>
|
||||
<item>283</item>
|
||||
</integer-array>
|
||||
|
||||
<!-- The max vibration strength allowed in audio haptic channels. -->
|
||||
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue