From 8be504000a250879dbb6c1a80545c02bc5d51daf Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 18 Jun 2019 12:02:42 -0700
Subject: Fixing onStateTransitionEnd is not called at the end of reset state

Bug: 135299165
Bug: 133867119
Change-Id: Ifac762a44fa45dfef72a9357f09fc96c34162565
---
 src/com/android/launcher3/LauncherStateManager.java | 4 ++++
 1 file changed, 4 insertions(+)

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);
+            }
         }
     }
 
-- 
cgit v1.2.3