summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Lee <llee@cyngn.com>2015-03-31 01:06:29 (GMT)
committerRajesh Yengisetty <rajesh@cyngn.com>2015-04-02 01:15:43 (GMT)
commit1a0a1d4836364dac9e021079a68bec75c2f0df9d (patch)
treedd7af16e45dceffb4dd4c097a0045d2f0ba32efa
parenta0db9234402fa85dab1a5ec408f96413f3a0a157 (diff)
downloadandroid_packages_apps_Trebuchet-1a0a1d4836364dac9e021079a68bec75c2f0df9d.zip
android_packages_apps_Trebuchet-1a0a1d4836364dac9e021079a68bec75c2f0df9d.tar.gz
android_packages_apps_Trebuchet-1a0a1d4836364dac9e021079a68bec75c2f0df9d.tar.bz2
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)
-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 80781c6..f23bff0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2727,6 +2727,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) {