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

am: bb117d7b42

Change-Id: Ie07ebe7afb437749fe4409660f4528a04588c3e1

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);
+            }
         }
     }