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

Commit 6988c81b authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into... 

Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into sc-v2-dev am: 1e4d07fe am: ffc00be4

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

Change-Id: Ib7125d938049a4030a05502a1cdc466dbf2de7dd
parents 077c6329 ffc00be4

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

+2 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (WindowManager.LayoutParams.isSystemAlertWindowType(mAttrs.type)) {

            return TouchOcclusionMode.USE_OPACITY;

        }

        if (isAnimating(PARENTS | TRANSITION, ANIMATION_TYPE_ALL)) {

        if (isAnimating(PARENTS | TRANSITION, ANIMATION_TYPE_ALL)

                || mWmService.mAtmService.getTransitionController().inTransition(this)) {

            return TouchOcclusionMode.USE_OPACITY;

        }

        return TouchOcclusionMode.BLOCK_UNTRUSTED;