commit 382aa1835c3e0e88d5ca33263cee39cc3ac5711e
author Michael Jurka <mikejurka@google.com> Mon Jun 11 15:42:07 2012 -0700
committer Michael Jurka <mikejurka@google.com> Mon Jun 11 16:30:55 2012 -0700
tree 98ab86ddaceb71f805159351177a6991013f6485
parent 5262bb3c4c4cd4fb566a5003154fa97edcde138b

Fix NPE

Bug: 6643246

Change-Id: I0b3fed0fa4e4fc5f4e1eccc97c0ec8f23e55024d

src/com/android/launcher2/Launcher.java

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