commit f75fa0f8e2ec3281caf0d63b5762a7addd56f50e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 06 18:55:20 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 06 18:55:20 2018 +0000
tree 1c260b646aa871f8e0816d7f40cbe7ddd523fad9
parent 108801840bbc0841adec9e16e33ce4ce427912db
parent 0cd2a254b261fea965f014cc3ea40c31f7fed37b

Merge "Reset state amanger, when switching from state animation to task launch animation" into ub-launcher3-edmonton

quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java

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