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

Browse Source
This commit is contained in:
Evan Rosky
2021-07-27 17:11:26 +00:00
committed by Android (Google) Code Review
parent 7d1040f716 30efa57419
commit 1e4d07fe1f
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)) { if (WindowManager.LayoutParams.isSystemAlertWindowType(mAttrs.type)) {
return TouchOcclusionMode.USE_OPACITY; 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.USE_OPACITY;
} }
return TouchOcclusionMode.BLOCK_UNTRUSTED; return TouchOcclusionMode.BLOCK_UNTRUSTED;