From 0cd2a254b261fea965f014cc3ea40c31f7fed37b Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 6 Jun 2018 11:43:15 -0700 Subject: [PATCH] Reset state amanger, when switching from state animation to task launch animation A pending task launch animation can set some transient properties on state manager. If the next animation is not a state animation, and reapply is not called, the transient properties are never cleared Bug: 79935289 Change-Id: I18398c74692960c460af537bf0c48801e69ac11e --- .../launcher3/uioverrides/PortraitStatesTouchController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java index 3fb7cd4802..c58bb94bb6 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java @@ -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);