Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-12-11 22:27:52 +00:00
committed by Android (Google) Code Review
parent e84bf9fddc cb17f18952
commit 72b047c6c3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -355,7 +355,8 @@ public class WindowAnimator {
boolean applyExistingExitAnimation = mPostKeyguardExitAnimation != null boolean applyExistingExitAnimation = mPostKeyguardExitAnimation != null
&& !winAnimator.mKeyguardGoingAwayAnimation && !winAnimator.mKeyguardGoingAwayAnimation
&& win.hasDrawnLw() && win.hasDrawnLw()
&& win.mAttachedWindow == null; && win.mAttachedWindow == null
&& mForceHiding != KEYGUARD_NOT_SHOWN;
// If the window is already showing and we don't need to apply an existing // If the window is already showing and we don't need to apply an existing
// Keyguard exit animation, skip. // Keyguard exit animation, skip.