Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d6627a9 authored by Craig Mautner's avatar Craig Mautner Committed by android-build-merger
Browse files

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

automerge: 922f8e2c

* commit '922f8e2c':
  Don't apply animations to windows that are showing
parents 99385aa9 922f8e2c

services/core/java/com/android/server/wm/WindowAnimator.java

+2 −1
Original line number Diff line number Diff line
@@ -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.