summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2020-04-06 11:55:46 +0800
committer Louis Chang <louischang@google.com> 2020-04-06 11:55:46 +0800
commit06107a36171df7702e0430be91ba34e0560fbb09 (patch)
treea21b583b326c7eeb7c8b0719832939cfd53a8a0e
parentf6edbe55fdc5bd057d529c774a24392dfe86e229 (diff)
Fix tasks not resized in split-screen
With 465b1e1, only root tasks are allowed to be organized. Therefore, the direct children of organized tasks are no longer evaluated as organized. Do not set bounds to the children of organized tasks, and just follow organized tasks to resize accordingly. Bug: 152619437 Test: drag divider in split-screen Change-Id: Icf84d3817b8cd506af49e54475f78eb001319d78
-rw-r--r--services/core/java/com/android/server/wm/Task.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index c891c1166a06..28998dadd072 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -2448,7 +2448,8 @@ class Task extends WindowContainer<WindowContainer> {
Rect updateOverrideConfigurationFromLaunchBounds() {
// If the task is controlled by another organized task, do not set override
// configurations and let its parent (organized task) to control it;
- final Rect bounds = isOrganized() && !isRootTask() ? null : getLaunchBounds();
+ final Task rootTask = getRootTask();
+ final Rect bounds = rootTask != this && rootTask.isOrganized() ? null : getLaunchBounds();
setBounds(bounds);
if (bounds != null && !bounds.isEmpty()) {
// TODO: Review if we actually want to do this - we are setting the launch bounds