Merge "Collect task in getOrCreateRootTask" into tm-qpr-dev am: 5a00f4b8fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20489496 Change-Id: Id0f8c35e1753d15909ee9080eca755c82762ada5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -929,6 +929,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
|
|||||||
// Update windowing mode if necessary, e.g. launch into a different windowing mode.
|
// Update windowing mode if necessary, e.g. launch into a different windowing mode.
|
||||||
if (windowingMode != WINDOWING_MODE_UNDEFINED && candidateTask.isRootTask()
|
if (windowingMode != WINDOWING_MODE_UNDEFINED && candidateTask.isRootTask()
|
||||||
&& candidateTask.getWindowingMode() != windowingMode) {
|
&& candidateTask.getWindowingMode() != windowingMode) {
|
||||||
|
candidateTask.mTransitionController.collect(candidateTask);
|
||||||
candidateTask.setWindowingMode(windowingMode);
|
candidateTask.setWindowingMode(windowingMode);
|
||||||
}
|
}
|
||||||
return candidateTask.getRootTask();
|
return candidateTask.getRootTask();
|
||||||
|
|||||||
Reference in New Issue
Block a user