diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-19 18:25:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-19 18:25:12 +0000 |
| commit | 234fc60302f16ef8a1d268a56d6a6402a7c6fcb6 (patch) | |
| tree | 388168e96a82e37287f0b668ef8f6b79ee860448 /src | |
| parent | a9a0dd7f3fbe21dfe6691ee54bd8e0c8f80c8c8a (diff) | |
| parent | 8be504000a250879dbb6c1a80545c02bc5d51daf (diff) | |
| download | android_packages_apps_Trebuchet-234fc60302f16ef8a1d268a56d6a6402a7c6fcb6.tar.gz android_packages_apps_Trebuchet-234fc60302f16ef8a1d268a56d6a6402a7c6fcb6.tar.bz2 android_packages_apps_Trebuchet-234fc60302f16ef8a1d268a56d6a6402a7c6fcb6.zip | |
Merge "Fixing onStateTransitionEnd is not called at the end of reset state" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 8b03691c8..4425e2af6 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -223,6 +223,7 @@ public class LauncherStateManager { } public void reapplyState(boolean cancelCurrentAnimation) { + boolean wasInAnimation = mConfig.mCurrentAnimation != null; if (cancelCurrentAnimation) { cancelAnimation(); } @@ -230,6 +231,9 @@ public class LauncherStateManager { for (StateHandler handler : getStateHandlers()) { handler.setState(mState); } + if (wasInAnimation) { + onStateTransitionEnd(mState); + } } } |