diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-06-12 13:15:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 13:15:19 -0700 |
| commit | 4131bb10e2927b57800060d93dd0a2eb13cc9c78 (patch) | |
| tree | 7e7b4daada44770198412fa02e3e2e22a3588144 /src/com/android/launcher2/Launcher.java | |
| parent | 56f5df728c6dd7108af774a10e57f3e2e2175d6f (diff) | |
| parent | 452a4f585d3cb707da0adf1fd91ba2c9c169b925 (diff) | |
| download | android_packages_apps_Trebuchet-4131bb10e2927b57800060d93dd0a2eb13cc9c78.tar.gz android_packages_apps_Trebuchet-4131bb10e2927b57800060d93dd0a2eb13cc9c78.tar.bz2 android_packages_apps_Trebuchet-4131bb10e2927b57800060d93dd0a2eb13cc9c78.zip | |
am 452a4f58: am a35a7807: Merge "Fix NPE" into jb-dev
* commit '452a4f585d3cb707da0adf1fd91ba2c9c169b925':
Fix NPE
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -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 b82ee281e..4ff7f6ee8 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2502,7 +2502,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 @@ -2516,7 +2516,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); } }; |