am 6b16286f: Merge "Notify windows when window animations complete" into jb-dev

* commit '6b16286f653f9f8a1c17a8dffebbe6cee4e5afca': Notify windows when window animations complete
2012-05-10 10:52:54 -07:00
parent 661769d02c 6b16286f65
commit b43c85fef1
1 changed files with 3 additions and 0 deletions
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -454,6 +454,7 @@ public class WindowAnimator {
        mPendingLayoutChanges = 0;
        mCurrentTime = SystemClock.uptimeMillis();
        mBulkUpdateParams = 0;
+        boolean wasAnimating = mAnimating;
        mAnimating = false;
        if (WindowManagerService.DEBUG_WINDOW_TRACE) {
            Slog.i(TAG, "!!! animate: entry time=" + mCurrentTime);
@@ -509,6 +510,8 @@ public class WindowAnimator {

        if (mAnimating) {
            mService.scheduleAnimationLocked();
+        } else if (wasAnimating) {
+            mService.requestTraversalLocked();
        }
        if (WindowManagerService.DEBUG_WINDOW_TRACE) {
            Slog.i(TAG, "!!! animate: exit mAnimating=" + mAnimating