diff options
| author | John Spurlock <jspurlock@google.com> | 2012-10-18 16:49:24 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-10-19 11:32:03 -0400 |
| commit | ed108f3d125b0a4cc465057e3514caf781cdea19 (patch) | |
| tree | d1e416f310fc443821fcc2591e49bbd8173c81c8 /services/java/com/android/server/power/PowerManagerService.java | |
| parent | a1f739ea83b6d770b8469ae1c2c4161f6fe96334 (diff) | |
| download | frameworks_base-ed108f3d125b0a4cc465057e3514caf781cdea19.zip frameworks_base-ed108f3d125b0a4cc465057e3514caf781cdea19.tar.gz frameworks_base-ed108f3d125b0a4cc465057e3514caf781cdea19.tar.bz2 | |
Frameworks base: Promote dream setting defaults to config.
So that:
- the values can be shared (to fix assoc bug)
- the values can be customized in product overlays
Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
Diffstat (limited to 'services/java/com/android/server/power/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index b94bceb..bf81a90 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -280,6 +280,15 @@ public final class PowerManagerService extends IPowerManager.Stub // True if dreams are supported on this device. private boolean mDreamsSupportedConfig; + // Default value for dreams enabled + private boolean mDreamsEnabledByDefaultConfig; + + // Default value for dreams activate-on-sleep + private boolean mDreamsActivatedOnSleepByDefaultConfig; + + // Default value for dreams activate-on-dock + private boolean mDreamsActivatedOnDockByDefaultConfig; + // True if dreams are enabled by the user. private boolean mDreamsEnabledSetting; @@ -490,20 +499,29 @@ public final class PowerManagerService extends IPowerManager.Stub mWakeUpWhenPluggedOrUnpluggedConfig = resources.getBoolean( com.android.internal.R.bool.config_unplugTurnsOnScreen); mDreamsSupportedConfig = resources.getBoolean( - com.android.internal.R.bool.config_enableDreams); + com.android.internal.R.bool.config_dreamsSupported); + mDreamsEnabledByDefaultConfig = resources.getBoolean( + com.android.internal.R.bool.config_dreamsEnabledByDefault); + mDreamsActivatedOnSleepByDefaultConfig = resources.getBoolean( + com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault); + mDreamsActivatedOnDockByDefaultConfig = resources.getBoolean( + com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault); } private void updateSettingsLocked() { final ContentResolver resolver = mContext.getContentResolver(); mDreamsEnabledSetting = (Settings.Secure.getIntForUser(resolver, - Settings.Secure.SCREENSAVER_ENABLED, 0, + Settings.Secure.SCREENSAVER_ENABLED, + mDreamsEnabledByDefaultConfig ? 1 : 0, UserHandle.USER_CURRENT) != 0); mDreamsActivateOnSleepSetting = (Settings.Secure.getIntForUser(resolver, - Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 0, + Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, + mDreamsActivatedOnSleepByDefaultConfig ? 1 : 0, UserHandle.USER_CURRENT) != 0); mDreamsActivateOnDockSetting = (Settings.Secure.getIntForUser(resolver, - Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 0, + Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, + mDreamsActivatedOnDockByDefaultConfig ? 1 : 0, UserHandle.USER_CURRENT) != 0); mScreenOffTimeoutSetting = Settings.System.getIntForUser(resolver, Settings.System.SCREEN_OFF_TIMEOUT, DEFAULT_SCREEN_OFF_TIMEOUT, |