summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/launcher3/Launcher.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index b1bafb189..5d857ce8c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2781,6 +2781,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) {