diff options
author | Michael Jurka <mikejurka@google.com> | 2012-06-11 16:48:42 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 16:48:42 -0700 |
commit | a35a7807c27641187e6de5dee8dcd405b683e294 (patch) | |
tree | f43df973e004001285d0778c6139842aa841d942 /src/com/android/launcher2 | |
parent | 898f152d79e06828675361a176772cdf1cef56ca (diff) | |
parent | 382aa1835c3e0e88d5ca33263cee39cc3ac5711e (diff) | |
download | packages_apps_trebuchet-a35a7807c27641187e6de5dee8dcd405b683e294.zip packages_apps_trebuchet-a35a7807c27641187e6de5dee8dcd405b683e294.tar.gz packages_apps_trebuchet-a35a7807c27641187e6de5dee8dcd405b683e294.tar.bz2 |
Merge "Fix NPE" into jb-dev
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0c0fdad..fc522aa 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -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); } }; |