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

Merge "Fix switching a background task into split screen unexpectedly" into tm-dev am: 2a3709618b am: 85edc35835 am: 30a0204cc5

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

Change-Id: I7ee28914dbcb3aaa2d0249196cbe2a17126b1fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-18 23:06:49 +00:00
committed by Automerger Merge Worker
parent cff49c498e 30a0204cc5
commit 5cf2ec430d
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -418,6 +418,13 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
} }
RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) { RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
if (isSplitScreenVisible()) {
// Evict child tasks except the top visible one under split root to ensure it could be
// launched as full screen when switching to it on recents.
final WindowContainerTransaction wct = new WindowContainerTransaction();
mStageCoordinator.prepareEvictInvisibleChildTasks(wct);
mSyncQueue.queue(wct);
}
return reparentSplitTasksForAnimation(apps, true /*splitExpectedToBeVisible*/); return reparentSplitTasksForAnimation(apps, true /*splitExpectedToBeVisible*/);
} }

5
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -537,6 +537,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
} }
void prepareEvictInvisibleChildTasks(WindowContainerTransaction wct) {
mMainStage.evictInvisibleChildren(wct);
mSideStage.evictInvisibleChildren(wct);
}
Bundle resolveStartStage(@StageType int stage, Bundle resolveStartStage(@StageType int stage,
@SplitPosition int position, @androidx.annotation.Nullable Bundle options, @SplitPosition int position, @androidx.annotation.Nullable Bundle options,
@androidx.annotation.Nullable WindowContainerTransaction wct) { @androidx.annotation.Nullable WindowContainerTransaction wct) {

9
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
View File

@@ -341,6 +341,15 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
} }
} }
void evictInvisibleChildren(WindowContainerTransaction wct) {
for (int i = mChildrenTaskInfo.size() - 1; i >= 0; i--) {
final ActivityManager.RunningTaskInfo taskInfo = mChildrenTaskInfo.valueAt(i);
if (!taskInfo.isVisible) {
wct.reparent(taskInfo.token, null /* parent */, false /* onTop */);
}
}
}
void onSplitScreenListenerRegistered(SplitScreen.SplitScreenListener listener, void onSplitScreenListenerRegistered(SplitScreen.SplitScreenListener listener,
@StageType int stage) { @StageType int stage) {
for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) { for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) {