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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17046840 Change-Id: I0fa258c985508c05238f234e4abf887276c2fa48
2022-03-02 00:12:15 +00:00
parent 233748318e bcc343d944
commit 47ce78a119
1 changed files with 4 additions and 1 deletions
@@ -762,7 +762,10 @@ public class TouchInteractionService extends Service
        } 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);