commit 4d7349bb6df5a01ba451aa1abd4c9f6349a57016
author Craig Mautner <cmautner@google.com> Fri Apr 20 14:52:47 2012 -0700
committer Craig Mautner <cmautner@google.com> Fri Apr 20 15:09:51 2012 -0700
tree b9e9278a7d0fb2e764ae139e07dab0a54ba505fb
parent 8e2f41426ce162a164d1074dd67ea4549ffd0711

Remove flicker from transitions.

Change state progressions to handle animation/layout separation.
Also added debug as needed.

Fixes bug 6360835.
Fixes bug 6206366.
Fixes bug 6286371.
Fixes bug 6240494.

Change-Id: I1079756a7e3e35ebb9f711f02d005bde9bf65ef0

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

diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java
index 7611a0f..f946f6c 100644
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -75,6 +75,9 @@
     DimAnimator mDimAnimator = null;
     DimAnimator.Parameters mDimParams = null;
 
+    static final int WALLPAPER_ACTION_PENDING = 1;
+    int mPendingActions;
+
     WindowAnimator(final WindowManagerService service, final Context context,
             final WindowManagerPolicy policy) {
         mService = service;
@@ -364,7 +367,9 @@
             for (int i=unForceHiding.size()-1; i>=0; i--) {
                 Animation a = mPolicy.createForceHideEnterAnimation(wallpaperInUnForceHiding);
                 if (a != null) {
-                    unForceHiding.get(i).setAnimation(a);
+                    final WindowStateAnimator winAnimator = unForceHiding.get(i);
+                    winAnimator.setAnimation(a);
+                    winAnimator.mAnimationIsEntrance = true;
                 }
             }
         }
@@ -421,13 +426,16 @@
         mWindowAnimationBackgroundColor = 0;
 
         updateWindowsAndWallpaperLocked();
+        if ((mPendingLayoutChanges & WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
+            mPendingActions |= WALLPAPER_ACTION_PENDING;
+        }
 
         if (mTokenMayBeDrawn) {
             testTokenMayBeDrawnLocked();
         }
     }
 
-    void animate() {
+    synchronized void animate() {
         mPendingLayoutChanges = 0;
         mCurrentTime = SystemClock.uptimeMillis();
         mBulkUpdateParams = 0;
@@ -554,4 +562,8 @@
             mAnimDh = animDh;
         }
     }
+
+    synchronized void clearPendingActions() {
+        mPendingActions = 0;
+    }
 }