From 297d789d444626191ff6dc29eb43aeaa1f917969 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Sun, 7 Oct 2012 15:14:45 -0700 Subject: [PATCH] More on #7296510 Transition from lock screen to dreaming is really bad The final iteration of that change was a little too aggresive in deciding when it turns off the dream's enter animation, so it was doing this always instead of just when it needed to (when it is being displayed to hide the lock screen). This change fixes a dumb typo that was causing the dream to always turn off its own animation (duh!) and tweaks the logic for deciding when the dream should be able to cause the lock screen to hide to better ensure that it is shown before the lock screen gets hidden. Change-Id: Ie73a5be9ee597713644fb2a0202f36c32b4f1fca --- .../com/android/internal/policy/impl/PhoneWindowManager.java | 4 ++-- 1 file changed, 2 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 e4ca8d83cf9aa..3351e6157ec56 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2925,14 +2925,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { mNoDreamEnterAnim = true; } if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW) - || attrs.type == TYPE_DREAM) + || (attrs.type == TYPE_DREAM && win.isVisibleLw())) && attrs.x == 0 && attrs.y == 0 && attrs.width == WindowManager.LayoutParams.MATCH_PARENT && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) { if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win); mTopFullscreenOpaqueWindowState = win; if (attrs.type == TYPE_DREAM) { - mNoDreamEnterAnim = true; + mForceStatusBarFromKeyguard = true; } if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) { if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);