summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerry Chang <chenghsiuchang@google.com> 2021-05-05 10:24:23 +0000
committer Jerry Chang <chenghsiuchang@google.com> 2021-05-05 12:23:50 +0000
commit49a59525f201b6814496557f1bc62154cd0e552e (patch)
treebd72c0bf19861b5196bd237d502a4e1c901ba67e
parentead969a489f92b41ed0abf71ff0b8d84b181dbf9 (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/Task.java20
1 files 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<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)) {