commit 8fa763284020bddb323ca07060166f72ed1a1c61
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 06 18:45:09 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 06 18:45:09 2018 +0000
tree a5d22b226bba1e034836bc54d265a59fd2cea265
parent 9c940a551f3eb4cb6754afd36793d8e970e6fa1e
parent f99417f8bb574cfae847c7290dc73ab76be59c64

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

Change-Id: I345bca035f5b2c00dedb39bfc8652f0136c461d5

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