Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I879e388686d2433156d4ed00ce6576a835e84a57
This commit is contained in:
Evan Rosky
2021-07-27 17:31:43 +00:00
committed by Automerger Merge Worker
parent 6213e3cd8e 1e4d07fe1f
commit ffc00be4fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1169,7 +1169,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;