summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-06-12 19:43:23 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 19:43:23 (GMT)
commit452a4f585d3cb707da0adf1fd91ba2c9c169b925 (patch)
treef43df973e004001285d0778c6139842aa841d942
parent5016b98520b9dbad8cf234a15fded9fb9e805ea2 (diff)
parenta35a7807c27641187e6de5dee8dcd405b683e294 (diff)
downloadandroid_packages_apps_Trebuchet-452a4f585d3cb707da0adf1fd91ba2c9c169b925.zip
android_packages_apps_Trebuchet-452a4f585d3cb707da0adf1fd91ba2c9c169b925.tar.gz
android_packages_apps_Trebuchet-452a4f585d3cb707da0adf1fd91ba2c9c169b925.tar.bz2
am a35a7807: Merge "Fix NPE" into jb-dev
* commit 'a35a7807c27641187e6de5dee8dcd405b683e294': Fix NPE
-rw-r--r--src/com/android/launcher2/Launcher.java4
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);
}
};