diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-06-06 11:43:15 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-06-06 11:45:00 -0700 |
commit | 0cd2a254b261fea965f014cc3ea40c31f7fed37b (patch) | |
tree | 2c1c0687819d7e29738f20deb9eec869963a1713 /quickstep | |
parent | 48412ca2c98a84f78d30f877fecd096f8f5ee738 (diff) | |
download | android_packages_apps_Trebuchet-0cd2a254b261fea965f014cc3ea40c31f7fed37b.tar.gz android_packages_apps_Trebuchet-0cd2a254b261fea965f014cc3ea40c31f7fed37b.tar.bz2 android_packages_apps_Trebuchet-0cd2a254b261fea965f014cc3ea40c31f7fed37b.zip |
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
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java index 3fb7cd480..c58bb94bb 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); |