Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68a2d66a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-5a1fc777-28dd-40a0-967f-68b8f7176b2c" into... 

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: 0cd2a254
  Reset state amanger, when switching from state animation to task launch animation
parents 69652337 f99417f8

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

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
        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);