commit 543528594aa36a1b3db7fda46d44fa3c9437c700
author Brian Isganitis <brianji@google.com> Fri Nov 18 21:38:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 18 21:38:58 2022 +0000
tree 330e39e92b0b8cf988c061df9a5ae19abcb39cac
parent d5ab17164d534d8a4206fa5ea482fe75292d2f26
parent 9390b500a9b4d8021416763b28289b71b7292f26

Merge "Only allow one TaskbarRecentsAnimationsListener at a time." into tm-qpr-dev

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index ea5df87..d790b4b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -186,6 +186,10 @@
         animatorSet.play(stashController.applyStateWithoutStart(duration));
         animatorSet.play(applyState(duration, false));
 
+        if (mTaskBarRecentsAnimationListener != null) {
+            mTaskBarRecentsAnimationListener.endGestureStateOverride(
+                    !mLauncher.isInState(LauncherState.OVERVIEW));
+        }
         mTaskBarRecentsAnimationListener = new TaskBarRecentsAnimationListener(callbacks);
         callbacks.addListener(mTaskBarRecentsAnimationListener);
         ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(() ->