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

Commit ead969a4 authored by Jerry Chang's avatar Jerry Chang
Browse files

Make sure tasks below home task is invisible while in split 

While in split mode, home task will be reparented to the secondary split
and leaving tasks not supporting split below. Because TaskDisplayArea
always adjusts home surface layer to the bottom, this makes sure those
tasks below home is invisible and won't occlude home task unexpectedly.

Fix: 185872271
Fix: 159767867
Test: dock translucent task to split primary while having task not
supporting split in recent, recent app won't be occluded.

Change-Id: Ie110ea302a0ec646b6c39f68606b31cd4c26697e
parent f941b5a2

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

+15 −5
Original line number Diff line number Diff line
@@ -4298,12 +4298,22 @@ class Task extends WindowContainer<WindowContainer> { 
                // the screen are opaque.

                return TASK_VISIBILITY_INVISIBLE;

            }

            if (isAssistantType && gotRootSplitScreenTask) {

            if (gotRootSplitScreenTask) {

                if (isAssistantType) {

                    // Assistant stack can't be visible behind split-screen. In addition to this not

                    // making sense, it also works around an issue here we boost the z-order of the

                    // assistant window surfaces in window manager whenever it is visible.

                    return TASK_VISIBILITY_INVISIBLE;

                }

                if (other.isHomeOrRecentsRootTask()) {

                    // While in split mode, home task will be reparented to the secondary split and

                    // leaving tasks not supporting split below. Due to

                    // TaskDisplayArea#assignRootTaskOrdering always adjusts home surface layer to

                    // the bottom, this makes sure those tasks below home is invisible and won't

                    // occlude home task unexpectedly.

                    return TASK_VISIBILITY_INVISIBLE;

                }

            }

            if (other.mAdjacentTask != null) {

                if (adjacentTasks.contains(other.mAdjacentTask)) {

                    if (other.isTranslucent(starting)