am bdd97d44: am 5fe770ab: mako: change brightness related value to use linear backlight curve
* commit 'bdd97d44adc6dc7c6326f839526c3086d0c13e3b':
mako: change brightness related value to use linear backlight curve
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 0fb3a00..fd51c37 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -68,17 +68,17 @@
than the size of the config_autoBrightnessLevels array.
This must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLcdBacklightValues">
- <item>22</item> <!-- 0-10 -->
- <item>38</item> <!-- 10-50 -->
- <item>47</item> <!-- 50-100 -->
- <item>63</item> <!-- 100-200 -->
- <item>85</item> <!-- 200-400 -->
- <item>94</item> <!-- 400-500 -->
- <item>110</item> <!-- 500-800 -->
- <item>126</item> <!-- 800-1000 -->
- <item>162</item> <!-- 1000-1600 -->
- <item>196</item> <!-- 1600-3000 -->
- <item>250</item> <!-- 3000-10000 -->
+ <item>14</item> <!-- 0-10 -->
+ <item>28</item> <!-- 10-50 -->
+ <item>37</item> <!-- 50-100 -->
+ <item>51</item> <!-- 100-200 -->
+ <item>71</item> <!-- 200-400 -->
+ <item>80</item> <!-- 400-500 -->
+ <item>96</item> <!-- 500-800 -->
+ <item>108</item> <!-- 800-1000 -->
+ <item>144</item> <!-- 1000-1600 -->
+ <item>181</item> <!-- 1600-3000 -->
+ <item>254</item> <!-- 3000-10000 -->
<item>255</item> <!-- 10000+ -->
</integer-array>
@@ -104,6 +104,14 @@
<!-- Minimum screen brightness allowed by the power manager. -->
<integer name="config_screenBrightnessDim">1</integer>
+ <!-- Default screen brightness setting.
+ Must be in the range specified by minimum and maximum. -->
+ <integer name="config_screenBrightnessSettingDefault">87</integer>
+
+ <!-- Minimum screen brightness setting allowed by the power manager.
+ The user is forbidden from setting the brightness below this level. -->
+ <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
<!-- The duration (in milliseconds) that the radio will scan for a signal
when there's no network connection. If the scan doesn't timeout, use zero -->
<integer name="config_radioScanningTimeout">9000</integer>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 930d4d9..4bb77d7 100644
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -21,4 +21,6 @@
<integer name="def_screen_off_timeout">30000</integer>
<!-- Set the automatic brightness mode on by default -->
<bool name="def_screen_brightness_automatic_mode">true</bool>
+ <!-- Default screen brightness, from 0 to 255. 87 is 34%. -->
+ <integer name="def_screen_brightness">87</integer>
</resources>
diff --git a/thermald-mako.conf b/thermald-mako.conf
index 68e240a..4527bee 100644
--- a/thermald-mako.conf
+++ b/thermald-mako.conf
@@ -82,5 +82,5 @@
thresholds 360 370 380 390 410 420 450
thresholds_clr 350 360 370 380 400 410 440
actions cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery
-action_info 1512000+400000000+248+0 1296000+325000000+228+0 1296000+325000000+208+0 1188000+200000000+195+1 1188000+200000000+195+1 1188000+200000000+195+2 1188000+200000000+195+3
+action_info 1512000+400000000+240+0 1296000+325000000+215+0 1296000+325000000+192+0 1188000+200000000+181+1 1188000+200000000+181+1 1188000+200000000+181+2 1188000+200000000+181+3