PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 7e0586b7a6 to master.

Browse Source 
Change-Id: I73b3e010249ac7380677cb2e635f4c847a8446c4
This commit is contained in:
Bart Sears
2016-01-13 21:19:59 -08:00
parent a9c8cf7bf5 7e0586b7a6
commit 8e7c979bad
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -5562,6 +5562,7 @@
<string name="keywords_default_apps">apps, default</string> <string name="keywords_default_apps">apps, default</string>
<string name="keywords_ignore_optimizations">ignore optimizations, doze, app standby</string> <string name="keywords_ignore_optimizations">ignore optimizations, doze, app standby</string>
<string name="keywords_color_mode">vibrant, RGB, sRGB, color, natural, standard</string> <string name="keywords_color_mode">vibrant, RGB, sRGB, color, natural, standard</string>
<string name="keywords_color_temperature">color temperature D65 D73 white yellow blue warm cool</string>
<string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string> <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
<string name="keywords_profile_challenge">work challenge, work, profile</string> <string name="keywords_profile_challenge">work challenge, work, profile</string>
@@ -6793,4 +6794,9 @@
<!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] --> <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
<string name="suggestion_remove">Remove</string> <string name="suggestion_remove">Remove</string>
<!-- Name of the setting to change the display's color temperature -->
<string name="color_temperature">Display color temperature</string>
<!-- Description of the setting to change the display's color temperature -->
<string name="color_temperature_desc">Enable cool temperature</string>
</resources> </resources>