Trebuchet: Fix bad ui state when backing twice quickly

If a user enters the widget add screen and quickly backs up
twice, the widget panel stays around and captures touch, but
the ui thinks it is in the homescreen.

Change-Id: I52a920fd633f3ab690ca1c959fbc8935c2d0bb69
(cherry picked from commit e423f8abb9462d0063e4504ff1386b127875e23b)

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 15df77fe6..647143fd9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2792,6 +2792,14 @@ public class Launcher extends Activity
             } else if (f2 != null) {
                 mDynamicGridSizeFragment.setSize();
             } else {
+                // if a user backs up twice very quickly from the widget add screen to the
+                // homescreen, the UI can get into a messed up state and mStateAnimation never
+                // completes or gets cancelled. Cancelling mStateAnimation here fixes this bug
+                if (mStateAnimation != null && mStateAnimation.isRunning()) {
+                    mStateAnimation.cancel();
+                    mStateAnimation = null;
+                }
+
                 mWorkspace.exitOverviewMode(true);
             }
         } else if (mWorkspace.getOpenFolder() != null) {