Merge "Fix NPE" into jb-dev

2012-06-11 16:48:42 -07:00
parent 898f152d79 382aa1835c
commit a35a7807c2
1 changed files with 2 additions and 2 deletions
@@ -2488,7 +2488,7 @@ public final class Launcher extends Activity
                    setPivotsForZoom(toView, scale);
                    dispatchOnLauncherTransitionStart(fromView, animated, false);
                    dispatchOnLauncherTransitionStart(toView, animated, false);
-                    mWorkspace.post(new Runnable() {
+                    toView.post(new Runnable() {
                        public void run() {
                            // Check that mStateAnimation hasn't changed while
                            // we waited for a layout/draw pass
@@ -2502,7 +2502,7 @@ public final class Launcher extends Activity
            if (delayAnim) {
                final OnGlobalLayoutListener delayedStart = new OnGlobalLayoutListener() {
                    public void onGlobalLayout() {
-                        mWorkspace.post(startAnimRunnable);
+                        toView.post(startAnimRunnable);
                        observer.removeOnGlobalLayoutListener(this);
                    }
                };