Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I89c3bb39bdbca926fdf2a5208c632c7b340e31e1
This commit is contained in:
TreeHugger Robot
2021-05-28 02:10:53 +00:00
committed by Automerger Merge Worker
parent 5c2adecbd3 9e901ed9e0
commit d844fb8bc8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -49,6 +49,7 @@ import android.util.IntArray;
import android.util.Slog; import android.util.Slog;
import android.view.RemoteAnimationTarget; import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.window.WindowContainerToken;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
import com.android.internal.annotations.VisibleForTesting; 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--) { for (int i = mTmpTasks.size() - 1; i >= 0; i--) {
final Task root = mTmpTasks.get(i); final Task root = mTmpTasks.get(i);
for (int j = 0; j < root.getChildCount(); j++) { for (int j = 0; j < root.getChildCount(); j++) {
wct.reparent(root.getChildAt(j).mRemoteToken.toWindowContainerToken(), final WindowContainerToken token =
null, true /* toTop */); root.getChildAt(j).mRemoteToken.toWindowContainerToken();
wct.reparent(token, null, true /* toTop */);
wct.setBounds(token, null);
} }
} }
mAtmService.mWindowOrganizerController.applyTransaction(wct); mAtmService.mWindowOrganizerController.applyTransaction(wct);