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

Merge "[DO NOT MERGE] ActivityEmbedding: hide embedded TaskFragment between adjacent TFs" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Li
2022-03-17 14:26:59 +00:00
committed by Android (Google) Code Review
parent 53c2f64d1e 906689084a
commit c48dfe548b
1 changed files with 9 additions and 3 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

@@ -822,11 +822,17 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (!adjacentTaskFragments.isEmpty() && !gotTranslucentAdjacent) { if (!adjacentTaskFragments.isEmpty() && !gotTranslucentAdjacent) {
// The z-order of this TaskFragment is in middle of two adjacent TaskFragments // The z-order of this TaskFragment is in middle of two adjacent TaskFragments
// and it cannot be visible if the TaskFragment on top is not translucent and // and it cannot be visible if the TaskFragment on top is not translucent and
// is fully occluding this one. // is occluding this one.
mTmpRect.set(getBounds());
for (int j = adjacentTaskFragments.size() - 1; j >= 0; --j) { for (int j = adjacentTaskFragments.size() - 1; j >= 0; --j) {
final TaskFragment taskFragment = adjacentTaskFragments.get(j); final TaskFragment taskFragment = adjacentTaskFragments.get(j);
if (!taskFragment.isTranslucent(starting) final TaskFragment adjacentTaskFragment =
&& taskFragment.getBounds().contains(this.getBounds())) { taskFragment.mAdjacentTaskFragment;
if (adjacentTaskFragment == this) {
continue;
}
if (mTmpRect.intersect(taskFragment.getBounds())
|| mTmpRect.intersect(adjacentTaskFragment.getBounds())) {
return TASK_FRAGMENT_VISIBILITY_INVISIBLE; return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
} }
} }