am 49779a15: Fix RuntimeException in LauncherViewPropertyAnimator

* commit '49779a155f8e7f752f6433db5e132ce8d01a1d9f': Fix RuntimeException in LauncherViewPropertyAnimator
2012-01-17 10:21:08 -08:00
parent 2b0a861e02 49779a155f
commit ebbdcf2011
1 changed files with 8 additions and 3 deletions
@@ -2312,13 +2312,18 @@ public final class Launcher extends Activity
            }

            if (delayAnim) {
+                final AnimatorSet stateAnimation = mStateAnimation;
                final OnGlobalLayoutListener delayedStart = new OnGlobalLayoutListener() {
                    public void onGlobalLayout() {
                        mWorkspace.post(new Runnable() {
                            public void run() {
-                                // Need to update pivots for zoom if layout changed
-                                setPivotsForZoom(toView, scale);
-                                mStateAnimation.start();
+                                // Check that mStateAnimation hasn't changed while
+                                // we waited for a layout pass
+                                if (mStateAnimation == stateAnimation) {
+                                    // Need to update pivots for zoom if layout changed
+                                    setPivotsForZoom(toView, scale);
+                                    mStateAnimation.start();
+                                }
                            }
                        });
                        observer.removeGlobalOnLayoutListener(this);