commit bcc343d944cb939b8f38fcc0835d47b5c654671e
author Evan Rosky <erosky@google.com> Tue Mar 01 23:49:06 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 01 23:49:06 2022 +0000
tree 0b48fd797f634b6c4c4ad31ab3d2d0bae1a67490
parent b7e181c741ff660a5ec98f564b763cad3df3309f
parent 9918df01af799a2849b17908c32e5894278990ff

Merge "Don't use incorrect inputconsumers during recents animation" into tm-dev

quickstep/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index fc5f34d..b224089 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -762,7 +762,10 @@
         } else if (gestureState.getRunningTask() == null) {
             return getDefaultInputConsumer();
         } else if (previousGestureState.isRunningAnimationToLauncher()
-                || gestureState.getActivityInterface().isResumed()
+                || (gestureState.getActivityInterface().isResumed()
+                        // with shell-transitions, home is resumed during recents animation, so
+                        // explicitly check against recents animation too.
+                        && !previousGestureState.isRecentsAnimationRunning())
                 || forceOverviewInputConsumer) {
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);