From 49a59525f201b6814496557f1bc62154cd0e552e Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Wed, 5 May 2021 10:24:23 +0000 Subject: Revert "Make sure tasks below home task is invisible while in split" This reverts commit ead969a489f92b41ed0abf71ff0b8d84b181dbf9. Reason for revert: to verify if this brokes wm flicker presubmit Fix: 187082054 Change-Id: I5cab74668ee985f23ceb2a28aa2c8b9bfa506311 --- services/core/java/com/android/server/wm/Task.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index e589856e115a..9fad7daa7212 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -4298,21 +4298,11 @@ class Task extends WindowContainer { // the screen are opaque. return TASK_VISIBILITY_INVISIBLE; } - 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 (isAssistantType && gotRootSplitScreenTask) { + // 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.mAdjacentTask != null) { if (adjacentTasks.contains(other.mAdjacentTask)) { -- cgit v1.2.3-59-g8ed1b