Merge "Fix tasks not resized in split-screen" into rvc-dev am: 55ace3ebb3 am: bf58390af6

Change-Id: I38d16fa375b7375d83e172ed5185fb4eb7f45406
This commit is contained in:
TreeHugger Robot
2020-04-07 01:30:25 +00:00
committed by Automerger Merge Worker

View File

@@ -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