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

Merge "Making activity invisible when occluded by one of the adjacent TF" into sc-v2-dev

Browse Source
This commit is contained in:
Louis Chang
2021-11-05 04:31:55 +00:00
committed by Android (Google) Code Review
parent 5dbf72509d ce07b079f0
commit e6a32faf86
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,6 +778,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
boolean gotOpaqueSplitScreenPrimary = false; boolean gotOpaqueSplitScreenPrimary = false;
boolean gotOpaqueSplitScreenSecondary = false; boolean gotOpaqueSplitScreenSecondary = false;
boolean gotTranslucentFullscreen = false; boolean gotTranslucentFullscreen = false;
boolean gotTranslucentAdjacent = false;
boolean gotTranslucentSplitScreenPrimary = false; boolean gotTranslucentSplitScreenPrimary = false;
boolean gotTranslucentSplitScreenSecondary = false; boolean gotTranslucentSplitScreenSecondary = false;
boolean shouldBeVisible = true; boolean shouldBeVisible = true;
@@ -806,6 +807,18 @@ class TaskFragment extends WindowContainer<WindowContainer> {
final boolean hasRunningActivities = hasRunningActivity(other); final boolean hasRunningActivities = hasRunningActivity(other);
if (other == this) { if (other == this) {
if (!adjacentTaskFragments.isEmpty() && !gotTranslucentAdjacent) {
// 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
// is fully occluding this one.
for (int j = adjacentTaskFragments.size() - 1; j >= 0; --j) {
final TaskFragment taskFragment = adjacentTaskFragments.get(j);
if (!taskFragment.isTranslucent(starting)
&& taskFragment.getBounds().contains(this.getBounds())) {
return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
}
}
}
// Should be visible if there is no other fragment occluding it, unless it doesn't // Should be visible if there is no other fragment occluding it, unless it doesn't
// have any running activities, not starting one and not home stack. // have any running activities, not starting one and not home stack.
shouldBeVisible = hasRunningActivities shouldBeVisible = hasRunningActivities
@@ -875,6 +888,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
|| otherTaskFrag.mAdjacentTaskFragment.isTranslucent(starting)) { || otherTaskFrag.mAdjacentTaskFragment.isTranslucent(starting)) {
// Can be visible behind a translucent adjacent TaskFragments. // Can be visible behind a translucent adjacent TaskFragments.
gotTranslucentFullscreen = true; gotTranslucentFullscreen = true;
gotTranslucentAdjacent = true;
continue; continue;
} }
// Can not be visible behind adjacent TaskFragments. // Can not be visible behind adjacent TaskFragments.