diff options
author | Daniel Sandler <dsandler@android.com> | 2011-11-17 10:38:37 -0800 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2011-11-18 08:00:04 -0800 |
commit | 2d54536d08a59680078f78bc6301379563df4c85 (patch) | |
tree | 32c9ea65d2037818fd8f106a1ca48490f13eab8d /policy | |
parent | dea90a0e1c9c1d15657024893b6793dc21bc27ef (diff) | |
download | frameworks_base-2d54536d08a59680078f78bc6301379563df4c85.zip frameworks_base-2d54536d08a59680078f78bc6301379563df4c85.tar.gz frameworks_base-2d54536d08a59680078f78bc6301379563df4c85.tar.bz2 |
Dreams (now Screen Candy) development.
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"
Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
Diffstat (limited to 'policy')
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 920aab8..e1676b8 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -400,7 +400,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // visual screen saver support int mScreenSaverTimeout = 0; - boolean mScreenSaverEnabled = true; + boolean mScreenSaverEnabledByUser = false; + boolean mScreenSaverMayRun = true; // false if a wakelock is held boolean mPluggedIn; // Behavior of ENDCALL Button. (See Settings.System.END_BUTTON_BEHAVIOR.) @@ -465,9 +466,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { Settings.Secure.DEFAULT_INPUT_METHOD), false, this); resolver.registerContentObserver(Settings.System.getUriFor( "fancy_rotation_anim"), false, this); + resolver.registerContentObserver(Settings.Secure.getUriFor( + Settings.Secure.SCREENSAVER_ENABLED), false, this); if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) { resolver.registerContentObserver(Settings.Secure.getUriFor( - Settings.Secure.DREAM_TIMEOUT), false, this); + "screensaver_timeout"), false, this); } // otherwise SCREEN_OFF_TIMEOUT will do nicely updateSettings(); } @@ -933,9 +936,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { updateRotation = true; } + mScreenSaverEnabledByUser = 0 != Settings.Secure.getInt(resolver, + Settings.Secure.SCREENSAVER_ENABLED, 1); + if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) { mScreenSaverTimeout = Settings.Secure.getInt(resolver, - Settings.Secure.DREAM_TIMEOUT, 0); + "screensaver_timeout", 0); } else { mScreenSaverTimeout = Settings.System.getInt(resolver, Settings.System.SCREEN_OFF_TIMEOUT, 0); @@ -3451,7 +3457,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { Runnable mScreenSaverActivator = new Runnable() { public void run() { - if (!(mScreenSaverEnabled && mScreenOnEarly)) { + if (!(mScreenSaverMayRun && mScreenOnEarly)) { Log.w(TAG, "mScreenSaverActivator ran, but the screensaver should not be showing. Who's driving this thing?"); return; } @@ -3464,7 +3470,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { try { String component = Settings.Secure.getString( - mContext.getContentResolver(), Settings.Secure.DREAM_COMPONENT); + mContext.getContentResolver(), Settings.Secure.SCREENSAVER_COMPONENT); if (component == null) { component = mContext.getResources().getString(R.string.config_defaultDreamComponent); } @@ -3492,13 +3498,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mScreenSaverActivator == null) return; mHandler.removeCallbacks(mScreenSaverActivator); - if (mScreenSaverEnabled && mScreenOnEarly && mScreenSaverTimeout > 0) { + if (mScreenSaverEnabledByUser && mScreenSaverMayRun && mScreenOnEarly && mScreenSaverTimeout > 0) { if (localLOGV) Log.v(TAG, "scheduling screensaver for " + mScreenSaverTimeout + "ms from now"); mHandler.postDelayed(mScreenSaverActivator, mScreenSaverTimeout); } else { if (localLOGV) { - if (mScreenSaverTimeout == 0) + if (!mScreenSaverEnabledByUser || mScreenSaverTimeout == 0) Log.v(TAG, "screen saver disabled by user"); else if (!mScreenOnEarly) Log.v(TAG, "screen saver disabled while screen off"); @@ -3714,7 +3720,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // The window manager has just grabbed a wake lock. This is our cue to disable the screen // saver. synchronized (mLock) { - mScreenSaverEnabled = false; + mScreenSaverMayRun = false; } } @@ -3728,7 +3734,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { synchronized (mLock) { // even if the keyguard is up, now that all the wakelocks have been released, we // should re-enable the screen saver - mScreenSaverEnabled = true; + mScreenSaverMayRun = true; updateScreenSaverTimeoutLocked(); } } |