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

am 4cd72169: Fix window animation flickering

Browse Source 
* commit '4cd7216967a3e6211785c8acdeca449d61d796a0':
  Fix window animation flickering
This commit is contained in:
Jorim Jaggi
2015-07-20 23:45:37 +00:00
committed by Android Git Automerger
parent e58ba842de 4cd7216967
commit 00fe1b650a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,7 +500,13 @@ public class WindowAnimator {
mPostKeyguardExitAnimation.getStartOffset(),
mPostKeyguardExitAnimation.getDuration());
mKeyguardGoingAway = false;
} else if (mPostKeyguardExitAnimation.hasEnded()) {
}
// mPostKeyguardExitAnimation might either be ended normally, cancelled, or "orphaned",
// meaning that the window it was running on was removed. We check for hasEnded() for
// ended normally and cancelled case, and check the time for the "orphaned" case.
else if (mPostKeyguardExitAnimation.hasEnded()
|| mCurrentTime - mPostKeyguardExitAnimation.getStartTime()
> mPostKeyguardExitAnimation.getDuration()) {
// Done with the animation, reset.
if (DEBUG_KEYGUARD) Slog.v(TAG, "Done with Keyguard exit animations.");
mPostKeyguardExitAnimation = null;