diff options
author | Steve Kondik <steve@cyngn.com> | 2015-03-31 17:43:34 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-31 17:43:34 -0700 |
commit | b6a9f52ec30cbfa2d349fe2d98a10dc3b9acf4b4 (patch) | |
tree | e392dc71628f7990293d7cfb26ac899dd2584762 /src/com/android/launcher3/Launcher.java | |
parent | 0a796c8767ab382db849e13b94069b265451f454 (diff) | |
parent | aba5c809387d78b1ddf583a8a201c9cdfd1dd71b (diff) | |
download | packages_apps_Trebuchet-b6a9f52ec30cbfa2d349fe2d98a10dc3b9acf4b4.tar.gz packages_apps_Trebuchet-b6a9f52ec30cbfa2d349fe2d98a10dc3b9acf4b4.tar.bz2 packages_apps_Trebuchet-b6a9f52ec30cbfa2d349fe2d98a10dc3b9acf4b4.zip |
Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_Trebuchet into cm-12.1
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
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) { |