commit f99417f8bb574cfae847c7290dc73ab76be59c64
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 06 18:45:07 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 06 18:45:07 2018 +0000
tree 5f1c032785d527631d985590cfc2ec4f59668d28
parent 4600bfca66b6edd96f160ff7865673afaef8358a
parent 0cd2a254b261fea965f014cc3ea40c31f7fed37b

[automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2

Change-Id: Ide18fd680c598701a8521e5fca1fecb0efd5f3a2

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