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

Merge "Keep top fullscreen tasks on top when dismiss splits"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-28 08:37:30 +00:00
committed by Android (Google) Code Review
parent 37b7788a41 7cac8493f9
commit 23ef82f4de
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1294,7 +1294,13 @@ final class TaskDisplayArea extends DisplayArea<Task> {
}
void onSplitScreenModeDismissed() {
onSplitScreenModeDismissed(null /* toTop */);
// The focused task could be a non-resizeable fullscreen root task that is on top of the
// other split-screen tasks, therefore had to dismiss split-screen, make sure the current
// focused root task can still be on top after dismissal
final Task rootTask = getFocusedStack();
final Task toTop =
rootTask != null && !rootTask.inSplitScreenWindowingMode() ? rootTask : null;
onSplitScreenModeDismissed(toTop);
}
void onSplitScreenModeDismissed(Task toTop) {