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

Merge "Avoid recursion for leaf task fragment in freeform mode" into main am: 30f6d64786 am: c6caf1223e am: 4625943b0e

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

Change-Id: I7069eb7cb7781221c4e23dd14dc2c895db15874c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2023-07-26 03:16:47 +00:00
committed by Automerger Merge Worker
parent dd6680b6a2 4625943b0e
commit c4d7ee11c9
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -1081,21 +1081,13 @@ class TaskFragment extends WindowContainer<WindowContainer> {
} }
final int otherWindowingMode = other.getWindowingMode(); final int otherWindowingMode = other.getWindowingMode();
if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN) { if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN
if (isTranslucent(other, starting)) { || (otherWindowingMode != WINDOWING_MODE_PINNED && other.matchParentBounds())) {
// Can be visible behind a translucent fullscreen TaskFragment.
gotTranslucentFullscreen = true;
continue;
}
return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
} else if (otherWindowingMode == WINDOWING_MODE_MULTI_WINDOW
&& other.matchParentBounds()) {
if (isTranslucent(other, starting)) { if (isTranslucent(other, starting)) {
// Can be visible behind a translucent TaskFragment. // Can be visible behind a translucent TaskFragment.
gotTranslucentFullscreen = true; gotTranslucentFullscreen = true;
continue; continue;
} }
// Multi-window TaskFragment that matches parent bounds would occlude other children
return TASK_FRAGMENT_VISIBILITY_INVISIBLE; return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
} }