Skip to content

Commit 297d789

Browse files
author
Dianne Hackborn
committed
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
1 parent 1ad0fd9 commit 297d789

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2925,14 +2925,14 @@ public void applyPostLayoutPolicyLw(WindowState win,
29252925
mNoDreamEnterAnim = true;
29262926
}
29272927
if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)
2928-
|| attrs.type == TYPE_DREAM)
2928+
|| (attrs.type == TYPE_DREAM && win.isVisibleLw()))
29292929
&& attrs.x == 0 && attrs.y == 0
29302930
&& attrs.width == WindowManager.LayoutParams.MATCH_PARENT
29312931
&& attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {
29322932
if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);
29332933
mTopFullscreenOpaqueWindowState = win;
29342934
if (attrs.type == TYPE_DREAM) {
2935-
mNoDreamEnterAnim = true;
2935+
mForceStatusBarFromKeyguard = true;
29362936
}
29372937
if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
29382938
if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);

0 commit comments

Comments
 (0)