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

am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev

Browse Source 
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
  Don't apply animations to windows that are showing
This commit is contained in:
Craig Mautner
2014-12-12 04:24:34 +00:00
committed by android-build-merger
parent 99385aa992 922f8e2c0f
commit 2d6627a9f2
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
&& !winAnimator.mKeyguardGoingAwayAnimation
&& 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
// Keyguard exit animation, skip.