diff options
author | Michael Jurka <mikejurka@google.com> | 2013-04-03 16:25:02 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-04-03 16:46:07 -0700 |
commit | df96add095c82f9083f75305d8fa155c8192a4e6 (patch) | |
tree | 5210ce976330068e9dc928b7f7d589841c8ac991 | |
parent | fe1fe268b6d9ffd99218117795b3524a87e5110b (diff) | |
download | android_packages_apps_Trebuchet-df96add095c82f9083f75305d8fa155c8192a4e6.tar.gz android_packages_apps_Trebuchet-df96add095c82f9083f75305d8fa155c8192a4e6.tar.bz2 android_packages_apps_Trebuchet-df96add095c82f9083f75305d8fa155c8192a4e6.zip |
Fix crash in draw listener
Bug: 8528246
Change-Id: Ie3600bed58dc393fcf71f735213a32b51551b52d
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 11 | ||||
-rw-r--r-- | src/com/android/launcher2/LauncherAnimUtils.java | 14 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 9e651c60c..56a854c00 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1272,15 +1272,22 @@ public final class Launcher extends Activity // layers on all the workspace pages, so that transitioning to Launcher from other // apps is nice and speedy. observer.addOnDrawListener(new ViewTreeObserver.OnDrawListener() { + private boolean mStarted = false; public void onDraw() { + if (mStarted) return; + mStarted = true; // We delay the layer building a bit in order to give // other message processing a time to run. In particular // this avoids a delay in hiding the IME if it was // currently shown, because doing that may involve // some communication back with the app. mWorkspace.postDelayed(mBuildLayersRunnable, 500); - - observer.removeOnDrawListener(this); + final ViewTreeObserver.OnDrawListener listener = this; + mWorkspace.post(new Runnable() { + public void run() { + mWorkspace.getViewTreeObserver().removeOnDrawListener(listener); + } + }); return; } }); diff --git a/src/com/android/launcher2/LauncherAnimUtils.java b/src/com/android/launcher2/LauncherAnimUtils.java index 5055d3505..a89cb4654 100644 --- a/src/com/android/launcher2/LauncherAnimUtils.java +++ b/src/com/android/launcher2/LauncherAnimUtils.java @@ -52,15 +52,23 @@ public class LauncherAnimUtils { // Helper method. Assumes a draw is pending, and that if the animation's duration is 0 // it should be cancelled public static void startAnimationAfterNextDraw(final Animator animator, final View view) { - final ViewTreeObserver observer = view.getViewTreeObserver(); - observer.addOnDrawListener(new ViewTreeObserver.OnDrawListener() { + view.getViewTreeObserver().addOnDrawListener(new ViewTreeObserver.OnDrawListener() { + private boolean mStarted = false; public void onDraw() { + if (mStarted) return; + mStarted = true; // Use this as a signal that the animation was cancelled if (animator.getDuration() == 0) { return; } animator.start(); - view.getViewTreeObserver().removeOnDrawListener(this); + + final ViewTreeObserver.OnDrawListener listener = this; + view.post(new Runnable() { + public void run() { + view.getViewTreeObserver().removeOnDrawListener(listener); + } + }); } }); } |