Merge changes from topic "am-5a1fc777-28dd-40a0-967f-68b8f7176b2c" into ub-launcher3-edmonton-polish
* changes:
[automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2
Reset state amanger, when switching from state animation to task launch animation
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java
index 3fb7cd4..c58bb94 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java
@@ -143,6 +143,8 @@
TaskView taskView = (TaskView) recentsView.getChildAt(recentsView.getNextPage());
if (recentsView.shouldSwipeDownLaunchApp() && mFromState == OVERVIEW && mToState == NORMAL
&& taskView != null) {
+ // Reset the state manager, when changing the interaction mode
+ mLauncher.getStateManager().goToState(OVERVIEW, false /* animate */);
mPendingAnimation = recentsView.createTaskLauncherAnimation(taskView, maxAccuracy);
mPendingAnimation.anim.setInterpolator(Interpolators.ZOOM_IN);