Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28d21fa9 authored by Chris Li's avatar Chris Li
Browse files

ActivityEmbedding: hide embedded TaskFragment between adjacent TFs 

An old secondary TaskFragment can be in middle of the primary and new
secondary TaskFragments. We don't want to show it even if it has a
different bounds from the new secondary.

Fix: 215467839
Test: atest SplitActivityLifecycleTest
Change-Id: I85dccdc4a931eda7d53c91d288ad19b6ef865dc9
parent 449fceaa

services/core/java/com/android/server/wm/TaskFragment.java

+9 −3
Original line number Diff line number Diff line
@@ -823,11 +823,17 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
                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.

                    // is occluding this one.

                    mTmpRect.set(getBounds());

                    for (int j = adjacentTaskFragments.size() - 1; j >= 0; --j) {

                        final TaskFragment taskFragment = adjacentTaskFragments.get(j);

                        if (!taskFragment.isTranslucent(starting)

                                && taskFragment.getBounds().contains(this.getBounds())) {

                        final TaskFragment adjacentTaskFragment =

                                taskFragment.mAdjacentTaskFragment;

                        if (adjacentTaskFragment == this) {

                            continue;

                        }

                        if (mTmpRect.intersect(taskFragment.getBounds())

                                || mTmpRect.intersect(adjacentTaskFragment.getBounds())) {

                            return TASK_FRAGMENT_VISIBILITY_INVISIBLE;

                        }

                    }