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

9
src/com/android/settings/DisplaySettings.java
View File

@@ -232,10 +232,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
}
private void updateScreenSaverSummary() {
boolean activatedOnSleep = DreamSettings.isScreenSaverActivatedOnSleep(getActivity());
boolean activatedOnDock = DreamSettings.isScreenSaverActivatedOnDock(getActivity());
mScreenSaverPreference.setSummary(
DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
? R.string.screensaver_settings_summary_on
: R.string.screensaver_settings_summary_off);
activatedOnSleep && activatedOnDock ? R.string.screensaver_settings_summary_both :
activatedOnSleep ? R.string.screensaver_settings_summary_sleep :
activatedOnDock ? R.string.screensaver_settings_summary_dock :
R.string.screensaver_settings_summary_off);
}
private void updateAccelerometerRotationCheckbox() {