diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6ab639b..d9e93ee 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -55,7 +55,17 @@
          level[n] <= value < level[n+1]  n+1
          level[MAX] <= value             MAX+1 -->
     <integer-array name="config_ambientThresholdLevels">
-        <item>15</item>
+        <item>10</item>
+    </integer-array>
+
+    <!-- Array of hysteresis constraint values for brightening, represented as tenths of a
+         percent. The length of this array is assumed to be one greater than
+         config_screenThresholdLevels. The brightening threshold is calculated as
+         screenBrightness * (1.0f + CONSTRAINT_VALUE). When the new screen brightness is higher
+         than this threshold, it is applied. See the config_screenThresholdLevels description for
+         how the constraint value is chosen. -->
+    <integer-array name="config_screenBrighteningThresholds">
+        <item>0</item>
     </integer-array>
 
     <!-- Array of hysteresis constraint values for darkening, represented as tenths of a
@@ -98,7 +108,6 @@
         <item>63</item>
         <item>86</item>
         <item>150</item>
-        <item>160</item>
         <item>220</item>
         <item>270</item>
         <item>360</item>
@@ -108,11 +117,33 @@
         <item>1000</item>
         <item>2000</item>
         <item>3100</item>
-        <item>5000</item>
-        <item>8000</item>
-        <item>12000</item>
-        <item>16000</item>
-        <item>20000</item>
+        <item>3988</item>
+        <item>5018</item>
+        <item>6232</item>
+        <item>7648</item>
+        <item>9280</item>
+        <item>11146</item>
+        <item>13261</item>
+        <item>15640</item>
+        <item>18302</item>
+        <item>21260</item>
+        <item>24532</item>
+        <item>28133</item>
+        <item>32080</item>
+        <item>36388</item>
+        <item>41073</item>
+        <item>46153</item>
+        <item>51642</item>
+        <item>63912</item>
+        <item>78015</item>
+        <item>94076</item>
+        <item>112226</item>
+        <item>132592</item>
+        <item>155302</item>
+        <item>180486</item>
+        <item>208271</item>
+        <item>223180</item>
+        <item>255108</item>
     </integer-array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
@@ -131,29 +162,50 @@
     <array name="config_autoBrightnessDisplayValuesNits">
         <item>2.0487</item>
         <item>4.8394</item>
-        <item>17.2619</item>
-        <item>39.2619</item>
-        <item>50.671</item>
-        <item>72.95</item>
-        <item>80.46</item>
+        <item>15.2619</item>
+        <item>33</item>
+        <item>49</item>
+        <item>62.95</item>
+        <item>76.46</item>
         <item>84.38</item>
         <item>89.51</item>
         <item>100.34</item>
-        <item>102.21</item>
         <item>109.48</item>
-        <item>114.19</item>
+        <item>115</item>
         <item>123.86</item>
         <item>129.18</item>
         <item>138.07</item>
-        <item>145.62</item>
-        <item>168.84</item>
+        <item>148.62</item>
+        <item>175.84</item>
         <item>234.9</item>
-        <item>280</item>
+        <item>279</item>
+        <item>300</item>
         <item>320</item>
+        <item>340</item>
         <item>360</item>
-        <item>405</item>
-        <item>450</item>
+        <item>380</item>
+        <item>400</item>
+        <item>420</item>
+        <item>440</item>
+        <item>460</item>
+        <item>480</item>
         <item>500</item>
+        <item>520</item>
+        <item>540</item>
+        <item>560</item>
+        <item>580</item>
+        <item>600</item>
+        <item>620</item>
+        <item>660</item>
+        <item>700</item>
+        <item>740</item>
+        <item>780</item>
+        <item>820</item>
+        <item>860</item>
+        <item>900</item>
+        <item>940</item>
+        <item>960</item>
+        <item>1000</item>
     </array>
 
     <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
@@ -164,71 +216,71 @@
 
          This array should be equal in size to config_screenBrightnessBacklight -->
     <array name="config_screenBrightnessNits">
-        <item>0</item>
-        <item>3.04</item>
-        <item>3.29</item>
-        <item>3.53</item>
-        <item>3.74</item>
-        <item>4.71</item>
-        <item>5.81</item>
-        <item>7.26</item>
-        <item>8.6</item>
-        <item>10.3</item>
-        <item>12.03</item>
-        <item>13.89</item>
-        <item>16.12</item>
-        <item>18.28</item>
-        <item>20.95</item>
-        <item>23.93</item>
-        <item>26.66</item>
-        <item>30.23</item>
-        <item>33.33</item>
-        <item>37.15</item>
-        <item>40.79</item>
-        <item>44.2</item>
-        <item>48.41</item>
-        <item>52.78</item>
-        <item>57.45</item>
-        <item>62.38</item>
-        <item>67.94</item>
-        <item>73.47</item>
-        <item>79.28</item>
-        <item>85.41</item>
-        <item>91.85</item>
-        <item>98.44</item>
-        <item>105.33</item>
-        <item>112.54</item>
-        <item>119.99</item>
-        <item>127.51</item>
-        <item>135.3</item>
-        <item>143.53</item>
-        <item>151.78</item>
-        <item>160.59</item>
-        <item>169.36</item>
-        <item>178.43</item>
-        <item>188.01</item>
-        <item>197.69</item>
-        <item>207.53</item>
-        <item>218.91</item>
-        <item>230.28</item>
-        <item>242.07</item>
-        <item>253.43</item>
-        <item>264.83</item>
-        <item>279.3</item>
-        <item>291.74</item>
-        <item>304.09</item>
-        <item>317.42</item>
-        <item>330.38</item>
-        <item>344.16</item>
-        <item>360.38</item>
-        <item>374.71</item>
-        <item>389.93</item>
-        <item>406.35</item>
-        <item>421.99</item>
-        <item>436.78</item>
-        <item>454.79</item>
-        <item>470.5</item>
-        <item>488.38</item>
+        <item>0.0</item>
+        <item>2.87</item>
+        <item>2.92</item>
+        <item>3.1</item>
+        <item>3.57</item>
+        <item>4.25</item>
+        <item>5.17</item>
+        <item>6.25</item>
+        <item>7.46</item>
+        <item>9.01</item>
+        <item>10.72</item>
+        <item>12.79</item>
+        <item>14.79</item>
+        <item>17.25</item>
+        <item>20.09</item>
+        <item>22.73</item>
+        <item>25.75</item>
+        <item>29.04</item>
+        <item>32.47</item>
+        <item>36.59</item>
+        <item>40.5</item>
+        <item>44.76</item>
+        <item>49.59</item>
+        <item>54.28</item>
+        <item>58.76</item>
+        <item>63.89</item>
+        <item>69.43</item>
+        <item>75.25</item>
+        <item>81.14</item>
+        <item>87.62</item>
+        <item>94.04</item>
+        <item>98.43</item>
+        <item>105.66</item>
+        <item>113.0</item>
+        <item>121.22</item>
+        <item>129.54</item>
+        <item>136.8</item>
+        <item>146.37</item>
+        <item>154.61</item>
+        <item>163.9</item>
+        <item>174.21</item>
+        <item>182.27</item>
+        <item>194.45</item>
+        <item>205.89</item>
+        <item>215.12</item>
+        <item>228.27</item>
+        <item>238.21</item>
+        <item>250.34</item>
+        <item>263.42</item>
+        <item>273.78</item>
+        <item>287.67</item>
+        <item>300.67</item>
+        <item>313.06</item>
+        <item>327.17</item>
+        <item>340.72</item>
+        <item>354.25</item>
+        <item>368.99</item>
+        <item>383.17</item>
+        <item>398.86</item>
+        <item>415.52</item>
+        <item>431.63</item>
+        <item>448.22</item>
+        <item>459.04</item>
+        <item>482.52</item>
+        <item>498.77</item>
     </array>
 
     <!-- An array describing the screen's backlight values corresponding to the brightness
@@ -311,7 +363,7 @@
     <!-- Default screen brightness setting set.
          -2 is invalid so setting will resort to int value specified above.
          Must be in the range specified by minimum and maximum. -->
-    <item type="dimen" name="config_screenBrightnessSettingDefaultFloat">0.44313726</item>
+    <item type="dimen" name="config_screenBrightnessSettingDefaultFloat">0.45882353</item>
 
     <!-- Maximum screen brightness allowed by the power manager.
          -2 is invalid so setting will resort to int value specified above.
@@ -323,7 +375,7 @@
          -2 is invalid so setting will resort to int value specified above.
          Set this to 0.0 to allow screen to go to minimal brightness.
          The user is forbidden from setting the brightness below this level. -->
-    <item type="dimen" name="config_screenBrightnessSettingMinimumFloat">0.007843137</item>
+    <item type="dimen" name="config_screenBrightnessSettingMinimumFloat">0.001954079</item>
 
     <!-- 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