Merge lp:~rsalveti/powerd/adding_device_configs_flo_hammerhead into lp:powerd

Proposed by Ricardo Salveti
Status: Merged
Approved by: Oliver Grawert
Approved revision: 112
Merged at revision: 112
Proposed branch: lp:~rsalveti/powerd/adding_device_configs_flo_hammerhead
Merge into: lp:powerd
Diff against target: 173 lines (+164/-0)
2 files modified
data/device_configs/config-flo.xml (+85/-0)
data/device_configs/config-hammerhead.xml (+79/-0)
To merge this branch: bzr merge lp:~rsalveti/powerd/adding_device_configs_flo_hammerhead
Reviewer Review Type Date Requested Status
Oliver Grawert Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+203644@code.launchpad.net

Commit message

Adding device config for flo and hammerhead

Description of the change

Adding device config for flo and hammerhead

Extracted from AOSP 4.4.2

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Oliver Grawert (ogra) wrote :

looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/device_configs/config-flo.xml'
2--- data/device_configs/config-flo.xml 1970-01-01 00:00:00 +0000
3+++ data/device_configs/config-flo.xml 2014-01-29 00:40:03 +0000
4@@ -0,0 +1,85 @@
5+<?xml version="1.0" encoding="utf-8"?>
6+<!--
7+/*
8+** Copyright 2012, The Android Open Source Project
9+**
10+** Licensed under the Apache License, Version 2.0 (the "License");
11+** you may not use this file except in compliance with the License.
12+** You may obtain a copy of the License at
13+**
14+** http://www.apache.org/licenses/LICENSE-2.0
15+**
16+** Unless required by applicable law or agreed to in writing, software
17+** distributed under the License is distributed on an "AS IS" BASIS,
18+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19+** See the License for the specific language governing permissions and
20+** limitations under the License.
21+*/
22+-->
23+
24+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
25+
26+ <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
27+ Software implementation will be used if config_hardware_auto_brightness_available is not set -->
28+ <bool name="config_automatic_brightness_available">true</bool>
29+
30+ <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
31+ The N entries of this array define N 1 zones as follows:
32+
33+ Zone 0: 0 <= LUX < array[0]
34+ Zone 1: array[0] <= LUX < array[1]
35+ ...
36+ Zone N: array[N - 1] <= LUX < array[N]
37+ Zone N + 1 array[N] <= LUX < infinity
38+
39+ Must be overridden in platform specific overlays -->
40+ <integer-array name="config_autoBrightnessLevels">
41+ <item>5</item>
42+ <item>15</item>
43+ <item>50</item>
44+ <item>100</item>
45+ <item>200</item>
46+ <item>400</item>
47+ <item>1000</item>
48+ <item>2000</item>
49+ <item>3000</item>
50+ <item>5000</item>
51+ <item>10000</item>
52+ <item>30000</item>
53+ </integer-array>
54+
55+ <!-- Array of output values for LCD backlight corresponding to the LUX values
56+ in the config_autoBrightnessLevels array. This array should have size one greater
57+ than the size of the config_autoBrightnessLevels array.
58+ This must be overridden in platform specific overlays -->
59+ <integer-array name="config_autoBrightnessLcdBacklightValues">
60+ <item>11</item> <!-- 0-5 -->
61+ <item>18</item> <!-- 5-15 -->
62+ <item>27</item> <!-- 15-50 -->
63+ <item>38</item> <!-- 50-100 -->
64+ <item>48</item> <!-- 100-200 -->
65+ <item>55</item> <!-- 200-400 -->
66+ <item>64</item> <!-- 400-1000 -->
67+ <item>74</item> <!-- 1000-2000 -->
68+ <item>120</item> <!-- 2000-3000 -->
69+ <item>164</item> <!-- 3000-5000 -->
70+ <item>225</item> <!-- 5000-10000 -->
71+ <item>255</item> <!-- 10000-30000 -->
72+ <item>255</item> <!-- 30000+ -->
73+ </integer-array>
74+
75+ <!-- Minimum screen brightness allowed by the power manager. -->
76+ <integer name="config_screenBrightnessDim">5</integer>
77+
78+ <!-- Default screen brightness setting.
79+ Must be in the range specified by minimum and maximum. -->
80+ <integer name="config_screenBrightnessSettingDefault">87</integer>
81+
82+ <!-- Minimum screen brightness setting allowed by the power manager.
83+ The user is forbidden from setting the brightness below this level. -->
84+ <integer name="config_screenBrightnessSettingMinimum">5</integer>
85+
86+ <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
87+ <integer name="config_shutdownBatteryTemperature">600</integer>
88+
89+</resources>
90
91=== added file 'data/device_configs/config-hammerhead.xml'
92--- data/device_configs/config-hammerhead.xml 1970-01-01 00:00:00 +0000
93+++ data/device_configs/config-hammerhead.xml 2014-01-29 00:40:03 +0000
94@@ -0,0 +1,79 @@
95+<?xml version="1.0" encoding="utf-8"?>
96+<!--
97+/*
98+** Copyright 2013, The Android Open Source Project
99+**
100+** Licensed under the Apache License, Version 2.0 (the "License");
101+** you may not use this file except in compliance with the License.
102+** You may obtain a copy of the License at
103+**
104+** http://www.apache.org/licenses/LICENSE-2.0
105+**
106+** Unless required by applicable law or agreed to in writing, software
107+** distributed under the License is distributed on an "AS IS" BASIS,
108+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
109+** See the License for the specific language governing permissions and
110+** limitations under the License.
111+*/
112+-->
113+
114+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
115+
116+ <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
117+ Software implementation will be used if config_hardware_auto_brightness_available is not set -->
118+ <bool name="config_automatic_brightness_available">true</bool>
119+
120+ <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
121+ The N entries of this array define N 1 zones as follows:
122+
123+ Zone 0: 0 <= LUX < array[0]
124+ Zone 1: array[0] <= LUX < array[1]
125+ ...
126+ Zone N: array[N - 1] <= LUX < array[N]
127+ Zone N + 1 array[N] <= LUX < infinity
128+
129+ Must be overridden in platform specific overlays -->
130+ <integer-array name="config_autoBrightnessLevels">
131+ <item>1</item>
132+ <item>4</item>
133+ <item>40</item>
134+ <item>350</item>
135+ <item>600</item>
136+ <item>1000</item>
137+ <item>1600</item>
138+ <item>3000</item>
139+ <item>10000</item>
140+ </integer-array>
141+
142+ <!-- Array of output values for LCD backlight corresponding to the LUX values
143+ in the config_autoBrightnessLevels array. This array should have size one greater
144+ than the size of the config_autoBrightnessLevels array.
145+ This must be overridden in platform specific overlays -->
146+ <integer-array name="config_autoBrightnessLcdBacklightValues">
147+ <item>13</item> <!-- 0-1 -->
148+ <item>26</item> <!-- 1-4 -->
149+ <item>73</item> <!-- 4-40 -->
150+ <item>88</item> <!-- 40-350 -->
151+ <item>130</item> <!-- 350-600 -->
152+ <item>167</item> <!-- 600-1000 -->
153+ <item>204</item> <!-- 1000-1600 -->
154+ <item>240</item> <!-- 1600-3000 -->
155+ <item>254</item> <!-- 3000-10000 -->
156+ <item>255</item> <!-- 10000+ -->
157+ </integer-array>
158+
159+ <!-- Minimum screen brightness allowed by the power manager. -->
160+ <integer name="config_screenBrightnessDim">1</integer>
161+
162+ <!-- Default screen brightness setting.
163+ Must be in the range specified by minimum and maximum. -->
164+ <integer name="config_screenBrightnessSettingDefault">82</integer>
165+
166+ <!-- Minimum screen brightness setting allowed by the power manager.
167+ The user is forbidden from setting the brightness below this level. -->
168+ <integer name="config_screenBrightnessSettingMinimum">1</integer>
169+
170+ <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
171+ <integer name="config_shutdownBatteryTemperature">600</integer>
172+
173+</resources>

Subscribers

People subscribed via source and target branches