Forráskód Böngészése

display: Sync config settings am: e7ee3e9d18 am: 7db501e7d7

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/19085659

Change-Id: I052edb4a9aec5f68d8693a50ef4a9f4044576f64
Signed-off-by: Automerger Merge Worker <[email protected]>
gilliu 2 éve
szülő
commit
496ebce769

+ 115 - 25
lynx/overlay/frameworks/base/core/res/res/values/config.xml

@@ -114,30 +114,30 @@
       array. The brightness values must be non-negative and non-decreasing. This must be
       array. The brightness values must be non-negative and non-decreasing. This must be
       overridden in platform specific overlays -->
       overridden in platform specific overlays -->
     <array name="config_autoBrightnessDisplayValuesNits">
     <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.0494638</item>    <!--  10000 -14000 -->
-      <item>901.4496943</item>    <!--  14000 -20000 -->
-      <item>1100.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.0494638</item>    <!--  10000 -14000 -->
+        <item>901.4496943</item>    <!--  14000 -20000 -->
+        <item>1100.0</item>         <!--  20000+ -->
     </array>
     </array>
 
 
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
@@ -145,7 +145,7 @@
          when adapting to brighter or darker environments.  This parameter controls how quickly
          when adapting to brighter or darker environments.  This parameter controls how quickly
          brightness changes occur in response to an observed change in light level that exceeds the
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
          hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
 
     <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
     <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
@@ -154,4 +154,94 @@
 
 
     <!-- The default peak refresh rate. -->
     <!-- The default peak refresh rate. -->
     <integer name="config_defaultPeakRefreshRate">90</integer>
     <integer name="config_defaultPeakRefreshRate">90</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_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>
+
 </resources>
 </resources>