diff options
| author | John Spurlock <jspurlock@google.com> | 2012-07-31 08:28:12 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-08-03 08:51:17 -0400 |
| commit | bc632a28e4fba4a659baf39b9fd3d06d10cfda97 (patch) | |
| tree | 7673f90d9f6a3aa9c47ea5c3a926ffa155e60f0c /policy/src | |
| parent | 187019c51fb1f8f79d4d5919facbc8d569ff844e (diff) | |
| download | frameworks_base-bc632a28e4fba4a659baf39b9fd3d06d10cfda97.zip frameworks_base-bc632a28e4fba4a659baf39b9fd3d06d10cfda97.tar.gz frameworks_base-bc632a28e4fba4a659baf39b9fd3d06d10cfda97.tar.bz2 | |
Re-enable dreams: frameworks/base
Enable feature in config. Expose Dream in public api for unbundled apps.
Unhide package. Add isDreaming() method to service.
Re-arrange the Dream api a bit. (use onStart as hook for subclasses).
Coordinate properly with power manager.
Replace old dock mode (don't fire old intent).
Change-Id: I1318d20cc1613e5d862f2913f2fcdc9719302cf7
Bug: 6921930
Diffstat (limited to 'policy/src')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 97b4cb5..215f597 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1132,7 +1132,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { com.android.internal.R.bool.config_enableDreams); mScreenSaverEnabledByUser = 0 != Settings.Secure.getInt(resolver, - Settings.Secure.SCREENSAVER_ENABLED, 1); + Settings.Secure.SCREENSAVER_ENABLED, 0); if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) { mScreenSaverTimeout = Settings.Secure.getInt(resolver, @@ -4076,7 +4076,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (dm == null) return; try { - if (localLOGV) Log.v(TAG, "startScreenSaver: awakening..."); + if (!dm.isDreaming()) return; + + if (localLOGV) Log.v(TAG, "stopScreenSaver: awakening..."); dm.awaken(); } catch (RemoteException ex) { |