Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4901c3f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Launcher won't get split screen config changed after dismissed"... 

Merge "Fix Launcher won't get split screen config changed after dismissed" into sc-dev am: 9e901ed9 am: 148c1192 am: df9bc439

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14731994

Change-Id: I6dc30777fb5dceec480edbed7c2d27b4cc9c0540
parents 08e07bf1 df9bc439

services/core/java/com/android/server/wm/TaskDisplayArea.java

+5 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.util.IntArray; 
import android.util.Slog;

import android.view.RemoteAnimationTarget;

import android.view.SurfaceControl;

import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import com.android.internal.annotations.VisibleForTesting;
@@ -1510,8 +1511,10 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
        for (int i = mTmpTasks.size() - 1; i >= 0; i--) {

            final Task root = mTmpTasks.get(i);

            for (int j = 0; j < root.getChildCount(); j++) {

                wct.reparent(root.getChildAt(j).mRemoteToken.toWindowContainerToken(),

                        null, true /* toTop */);

                final WindowContainerToken token =

                        root.getChildAt(j).mRemoteToken.toWindowContainerToken();

                wct.reparent(token, null, true /* toTop */);

                wct.setBounds(token, null);

            }

        }

        mAtmService.mWindowOrganizerController.applyTransaction(wct);