commit 0d2adfbbb3b2f2990fc2265dfadca0252a5b4bb5
author Adam Cohen <adamcohen@google.com> Thu Sep 04 01:27:53 2014 +0200
committer Adam Cohen <adamcohen@google.com> Thu Sep 04 01:29:26 2014 +0200
tree 5c4403c17f5731dc1d449ae4b4ec4f47b834985d
parent 6a2c77856f1cfa402363cfbb04b5718b431bbc6e

Potential fix for a couple bugs

issue 17371274
issue 17368590

Change-Id: I717f9c37613efd9d61e401540ca82aff77058022

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 83f813d..ffce116 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3373,6 +3373,9 @@
             final AnimatorSet stateAnimation = mStateAnimation;
             final Runnable startAnimRunnable = new Runnable() {
                 public void run() {
+                    if (!toView.isAttachedToWindow()) {
+                        return;
+                    }
                     // Check that mStateAnimation hasn't changed while
                     // we waited for a layout/draw pass
                     if (mStateAnimation != stateAnimation)
@@ -3618,6 +3621,9 @@
             final AnimatorSet stateAnimation = mStateAnimation;
             final Runnable startAnimRunnable = new Runnable() {
                 public void run() {
+                    if (!fromView.isAttachedToWindow()) {
+                        return;
+                    }
                     // Check that mStateAnimation hasn't changed while
                     // we waited for a layout/draw pass
                     if (mStateAnimation != stateAnimation)