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

Commit 3c032be7 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Skip setting focused window to the recents animation target" into... 

Merge "Skip setting focused window to the recents animation target" into sc-dev am: 54255f7a am: 16e1cf0b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14348305

Change-Id: If37bd94c5c893e39af985cc46375353470725c30
parents 528f56cf 16e1cf0b

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

+10 −0
Original line number Diff line number Diff line
@@ -8123,6 +8123,16 @@ public class WindowManagerService extends IWindowManager.Stub 
            return;

        }



        if (mRecentsAnimationController != null

                && mRecentsAnimationController.getTargetAppMainWindow() == touchedWindow) {

            // If there is an active recents animation and touched window is the target, then ignore

            // the touch. The target already handles touches using its own input monitor and we

            // don't want to trigger any lifecycle changes from focusing another window.

            // TODO(b/186770026): We should remove this once we support multiple resumed activities

            //                    while in overview

            return;

        }



        ProtoLog.i(WM_DEBUG_FOCUS_LIGHT, "onPointerDownOutsideFocusLocked called on %s",

                touchedWindow);

        final DisplayContent displayContent = touchedWindow.getDisplayContent();