diff options
author | Adnan Begovic <adnan@cyngn.com> | 2015-11-10 18:10:54 -0800 |
---|---|---|
committer | Adnan Begovic <adnan@cyngn.com> | 2015-11-10 18:10:54 -0800 |
commit | a09defa3c908589ad47cac7cd0de80c02832d532 (patch) | |
tree | 393a1c6d8d580316bde5c6bfdc3be1bb144ed120 /cm/res | |
parent | b006e980e73b60a71139fda3c4fb9e6e1f97d9c8 (diff) | |
download | vendor_cmsdk-a09defa3c908589ad47cac7cd0de80c02832d532.zip vendor_cmsdk-a09defa3c908589ad47cac7cd0de80c02832d532.tar.gz vendor_cmsdk-a09defa3c908589ad47cac7cd0de80c02832d532.tar.bz2 |
cmsdk: Move LiveDisplay settings and resources.
Change-Id: I6d0c3f8b645e2c8cca059ff343a774eab1933a9b
Diffstat (limited to 'cm/res')
-rw-r--r-- | cm/res/res/drawable/ic_livedisplay_notif.xml | 29 | ||||
-rw-r--r-- | cm/res/res/values/arrays.xml | 27 | ||||
-rw-r--r-- | cm/res/res/values/config.xml | 4 | ||||
-rw-r--r-- | cm/res/res/values/strings.xml | 14 | ||||
-rw-r--r-- | cm/res/res/values/symbols.xml | 19 |
5 files changed, 92 insertions, 1 deletions
diff --git a/cm/res/res/drawable/ic_livedisplay_notif.xml b/cm/res/res/drawable/ic_livedisplay_notif.xml new file mode 100644 index 0000000..a7cb8c6 --- /dev/null +++ b/cm/res/res/drawable/ic_livedisplay_notif.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2015 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="#FFFFFF" + android:pathData="M15.5,15.5c0.4-0.4,0.7-0.8,0.9-1.2c-1.9,1-4.3,0.7-5.8-0.9s-1.9-4-0.9-5.8C9.2,7.8,8.8,8.1,8.5,8.5 +c-2,2-2,5.1,0,7.1S13.6,17.5,15.5,15.5z M19,5v14H5V5H19 +M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5 +C21,3.9,20.1,3,19,3L19,3z" /> +</vector>
\ No newline at end of file diff --git a/cm/res/res/values/arrays.xml b/cm/res/res/values/arrays.xml index 2b78750..ec3fceb 100644 --- a/cm/res/res/values/arrays.xml +++ b/cm/res/res/values/arrays.xml @@ -24,7 +24,7 @@ <item>@string/perf_profile_perf</item> </string-array> - <!-- These values are intentionally out of ordert to give an "ascending" + <!-- These values are intentionally out of order to give an "ascending" view of the modes while allowing devices to easily omit the bias modes if they are not applicable or needed. These values correspond to the enumeration in PerformanceManager. --> @@ -35,4 +35,29 @@ <item>4</item> <item>2</item> </integer-array> + + <!-- LiveDisplay --> + <string-array name="live_display_entries" translatable="false"> + <item>@string/live_display_auto</item> + <item>@string/live_display_off</item> + <item>@string/live_display_day</item> + <item>@string/live_display_night</item> + <item>@string/live_display_outdoor</item> + </string-array> + + <string-array name="live_display_summaries" translatable="false"> + <item>@string/live_display_auto_summary</item> + <item>@string/live_display_off_summary</item> + <item>@string/live_display_day_summary</item> + <item>@string/live_display_night_summary</item> + <item>@string/live_display_outdoor_summary</item> + </string-array> + + <string-array name="live_display_values" translatable="false"> + <item>2</item> + <item>0</item> + <item>4</item> + <item>1</item> + <item>3</item> + </string-array> </resources> diff --git a/cm/res/res/values/config.xml b/cm/res/res/values/config.xml index de167c3..e655322 100644 --- a/cm/res/res/values/config.xml +++ b/cm/res/res/values/config.xml @@ -51,4 +51,8 @@ <integer name="config_proximityCheckTimeout">250</integer> <bool name="config_proximityCheckOnWakeEnabledByDefault">false</bool> + <!-- Default values for display color temperature --> + <integer name="config_dayColorTemperature">6500</integer> + <integer name="config_nightColorTemperature">4500</integer> + <integer name="config_outdoorAmbientLux">9000</integer> </resources> diff --git a/cm/res/res/values/strings.xml b/cm/res/res/values/strings.xml index 5260650..3284321 100644 --- a/cm/res/res/values/strings.xml +++ b/cm/res/res/values/strings.xml @@ -103,4 +103,18 @@ <string name="perf_profile_bias_power">Efficiency</string> <string name="perf_profile_bias_perf">Quick</string> + <!-- LiveDisplay strings --> + <string name="live_display_title" translatable="false">LiveDisplay</string> + <string name="live_display_auto">Automatic</string> + <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string> + <string name="live_display_off">Off</string> + <string name="live_display_off_summary">Disable all adjustments</string> + <string name="live_display_day">Day</string> + <string name="live_display_day_summary">Use day settings only</string> + <string name="live_display_night">Night</string> + <string name="live_display_night_summary">Use night settings only</string> + <string name="live_display_outdoor">Outdoor (bright sun)</string> + <string name="live_display_outdoor_summary">Use outdoor settings only</string> + <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string> + </resources> diff --git a/cm/res/res/values/symbols.xml b/cm/res/res/values/symbols.xml index 8bff9c3..e8a61a6 100644 --- a/cm/res/res/values/symbols.xml +++ b/cm/res/res/values/symbols.xml @@ -50,4 +50,23 @@ <!-- Proximity check on screen on default --> <java-symbol type="bool" name="config_proximityCheckOnWakeEnabledByDefault" /> + <!-- LiveDisplay --> + <java-symbol type="string" name="live_display_title" /> + <java-symbol type="string" name="live_display_hint" /> + <java-symbol type="string" name="live_display_auto" /> + <java-symbol type="string" name="live_display_auto_summary" /> + <java-symbol type="string" name="live_display_day" /> + <java-symbol type="string" name="live_display_day_summary" /> + <java-symbol type="string" name="live_display_night" /> + <java-symbol type="string" name="live_display_night_summary" /> + <java-symbol type="string" name="live_display_outdoor" /> + <java-symbol type="string" name="live_display_outdoor_summary" /> + <java-symbol type="drawable" name="ic_livedisplay_notif" /> + + <java-symbol type="array" name="live_display_entries" /> + <java-symbol type="array" name="live_display_summaries" /> + <java-symbol type="array" name="live_display_values" /> + <java-symbol type="integer" name="config_dayColorTemperature" /> + <java-symbol type="integer" name="config_nightColorTemperature" /> + <java-symbol type="integer" name="config_outdoorAmbientLux" /> </resources> |