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

Commit f14bb8ab authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Make sure tasks below home task is invisible while in split" into sc-dev am: 52e3d9a4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14328763

Change-Id: I52d6b6df617d0acc9d49824b02339a7817fe4bb4
parents d108a41e 52e3d9a4

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

+15 −5
Original line number Diff line number Diff line
@@ -4315,12 +4315,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)