Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 684de2d7 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Android (Google) Code Review
Browse files

Merge "ShellTranstion: Apply recents input consumer when the window in transion"

parents 40cfea7d 1f5f0d00

services/core/java/com/android/server/wm/InputMonitor.java

+2 −1
Original line number Diff line number Diff line
@@ -399,10 +399,11 @@ final class InputMonitor { 
        if (recentsAnimationInputConsumer != null && focus != null) {

            final RecentsAnimationController recentsAnimationController =

                    mService.getRecentsAnimationController();

            // Apply recents input consumer when the focusing window is in recents animation.

            final boolean shouldApplyRecentsInputConsumer = (recentsAnimationController != null

                    && recentsAnimationController.shouldApplyInputConsumer(focus.mActivityRecord))

                    // Shell transitions doesn't use RecentsAnimationController

                    || getWeak(mActiveRecentsActivity) != null;

                    || getWeak(mActiveRecentsActivity) != null && focus.inTransition();

            if (shouldApplyRecentsInputConsumer) {

                requestFocus(recentsAnimationInputConsumer.mWindowHandle.token,

                        recentsAnimationInputConsumer.mName);