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

Re-enable dreams: Settings

Browse Source 
Re-arrange settings and captions for dreams.  Activation on sleep
and activation on dock now independent. Sleep activation defaults to off,
dock activation defaults to on (replacing dock mode).

Also use dream manager service for testing dream preference, and properly
disable preferences if both dream activations are disabled.

Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26
Bug: 6921930
This commit is contained in:
John Spurlock
2012-07-31 08:24:27 -04:00
committed by Daniel Sandler
parent 6a20ce5e51
commit d541b6fd1c
5 changed files with 115 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/values/strings.xml
View File

@@ -1687,13 +1687,17 @@
<!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
<!-- Display settings screen, trigger for screen saver options -->
<string name="screensaver_settings_title">Screen Candy</string>
<!-- Display settings screen, summary for screen saver options, screen saver is turned on -->
<string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string>
<string name="screensaver_settings_title">Dream</string>
<!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
<string name="screensaver_settings_summary_both">When docked or asleep and charging</string>
<!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
<string name="screensaver_settings_summary_sleep">When asleep and charging</string>
<!-- Display settings screen, summary fragment for screen saver options, activated when docked -->
<string name="screensaver_settings_summary_dock">When docked</string>
<!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
<string name="screensaver_settings_summary_off">Disabled</string>
<!-- Screen saver settings, setting option name to select a module -->
<string name="screensaver_component_title">Selected candy</string>
<string name="screensaver_component_title">Selected dream</string>
<!-- Screen saver settings, setting option name to change activation timeout -->
<string name="screensaver_timeout_title">When to activate</string>
<!-- Screen saver settings, setting option summary to change activation timeout -->
@@ -1702,9 +1706,12 @@
<string name="screensaver_timeout_zero_summary">Never</string>
<!-- Screen saver settings, button allowing the user to test/try the current module -->
<string name="screensaver_test">Try it!</string>
<!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
the device sleeps -->
<string name="screensaver_activate_on_sleep_title">Start on sleep</string>
<!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
the device is docked -->
<string name="screensaver_activate_on_dock_title">Also start when docked</string>
<string name="screensaver_activate_on_dock_title">Start when docked</string>
<!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
<string name="automatic_brightness">Automatic brightness</string>
<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->