commit 4131bb10e2927b57800060d93dd0a2eb13cc9c78
author Michael Jurka <mikejurka@google.com> Tue Jun 12 13:15:19 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 13:15:19 2012 -0700
tree 7e7b4daada44770198412fa02e3e2e22a3588144
parent 56f5df728c6dd7108af774a10e57f3e2e2175d6f
parent 452a4f585d3cb707da0adf1fd91ba2c9c169b925

am 452a4f58: am a35a7807: Merge "Fix NPE" into jb-dev

* commit '452a4f585d3cb707da0adf1fd91ba2c9c169b925':
  Fix NPE

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b82ee28..4ff7f6e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2502,7 +2502,7 @@
                     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
@@ -2516,7 +2516,7 @@
             if (delayAnim) {
                 final OnGlobalLayoutListener delayedStart = new OnGlobalLayoutListener() {
                     public void onGlobalLayout() {
-                        mWorkspace.post(startAnimRunnable);
+                        toView.post(startAnimRunnable);
                         observer.removeOnGlobalLayoutListener(this);
                     }
                 };