From 6146a4a6f84bc0cae6c65603c656d2e54264fe3a Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Sat, 17 Feb 2024 15:40:49 +0800 Subject: [PATCH] Fixed - going to home when tapping nav pill multiple times Error Reproduce : Make sure lawnchair set as Recent Provider 1. Open app 2. Tap multiple nav pill 3. issue occur --- .../quickstep/inputconsumers/OtherActivityInputConsumer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index 7e6116720b..04c420e398 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -439,7 +439,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC // starting the gesture. In that case, we need to clean-up an unfinished or un-started // animation. if (mActiveCallbacks != null && mInteractionHandler != null) { - if (mTaskAnimationManager.isRecentsAnimationRunning()) { + if (mTaskAnimationManager.isRecentsAnimationRunning() + && !allowInterceptByParent()) { // The animation started, but with no movement, in this case, there will be no // animateToProgress so we have to manually finish here. In the case of // ACTION_CANCEL, someone else may be doing something so finish synchronously.