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

Merge "[wm]: Move split-secondary stack to front when split-screen is dismissed"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-28 20:27:04 +00:00
committed by Android (Google) Code Review
parent 6677d802e8 6e7fd3e2d6
commit 47c546f666
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -1302,6 +1302,11 @@ class ActivityStack extends ConfigurationContainer {
return;
}
getDisplay().positionChildAtBottom(this, reason);
if (task != null) {
insertTaskAtBottom(task);
}
/**
* The intent behind moving a primary split screen stack to the back is usually to hide
* behind the home stack. Exit split screen in this case.
@@ -1309,11 +1314,6 @@ class ActivityStack extends ConfigurationContainer {
if (getWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) {
setWindowingMode(WINDOWING_MODE_UNDEFINED);
}
getDisplay().positionChildAtBottom(this, reason);
if (task != null) {
insertTaskAtBottom(task);
}
}
boolean isFocusable() {

6
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -3918,10 +3918,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
// Caller wants the current split-screen primary stack to be the top stack after
// it goes fullscreen, so move it to the front.
stack.moveToFront("dismissSplitScreenMode");
} else if (mRootActivityContainer.isTopDisplayFocusedStack(stack)) {
} else {
// In this case the current split-screen primary stack shouldn't be the top
// stack after it goes fullscreen, but it current has focus, so we move the
// focus to the top-most split-screen secondary stack next to it.
// stack after it goes fullscreen, so we move the focus to the top-most
// split-screen secondary stack next to it.
final ActivityStack otherStack = stack.getDisplay().getTopStackInWindowingMode(
WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
if (otherStack != null) {