commit 234fc60302f16ef8a1d268a56d6a6402a7c6fcb6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 19 18:25:12 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 19 18:25:12 2019 +0000
tree 388168e96a82e37287f0b668ef8f6b79ee860448
parent a9a0dd7f3fbe21dfe6691ee54bd8e0c8f80c8c8a
parent 8be504000a250879dbb6c1a80545c02bc5d51daf

Merge "Fixing onStateTransitionEnd is not called at the end of reset state" into ub-launcher3-qt-dev

src/com/android/launcher3/LauncherStateManager.java

diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 8b03691..4425e2a 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -223,6 +223,7 @@
     }
 
     public void reapplyState(boolean cancelCurrentAnimation) {
+        boolean wasInAnimation = mConfig.mCurrentAnimation != null;
         if (cancelCurrentAnimation) {
             cancelAnimation();
         }
@@ -230,6 +231,9 @@
             for (StateHandler handler : getStateHandlers()) {
                 handler.setState(mState);
             }
+            if (wasInAnimation) {
+                onStateTransitionEnd(mState);
+            }
         }
     }