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

Merge "Fix side stage cannot be focused" into sc-v2-dev

Browse Source
This commit is contained in:
Tony Huang
2021-11-01 02:55:17 +00:00
committed by Android (Google) Code Review
parent 91da8a2976 2003f5796c
commit 28643db5fe
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,11 @@ class SideStage extends StageTaskListener {
stageTaskUnfoldController); stageTaskUnfoldController);
} }
void moveToTop(Rect rootBounds, WindowContainerTransaction wct) {
final WindowContainerToken rootToken = mRootTaskInfo.token;
wct.setBounds(rootToken, rootBounds).reorder(rootToken, true /* onTop */);
}
void addTask(ActivityManager.RunningTaskInfo task, Rect rootBounds, void addTask(ActivityManager.RunningTaskInfo task, Rect rootBounds,
WindowContainerTransaction wct) { WindowContainerTransaction wct) {
final WindowContainerToken rootToken = mRootTaskInfo.token; final WindowContainerToken rootToken = mRootTaskInfo.token;

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

@@ -758,7 +758,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
// Make sure the main stage is active. // Make sure the main stage is active.
mMainStage.activate(getMainStageBounds(), wct, true /* reparent */); mMainStage.activate(getMainStageBounds(), wct, true /* reparent */);
mSideStage.setBounds(getSideStageBounds(), wct); mSideStage.moveToTop(getSideStageBounds(), wct);
mTaskOrganizer.applyTransaction(wct); mTaskOrganizer.applyTransaction(wct);
} }
if (!mLogger.hasStartedSession() && mMainStageListener.mHasChildren if (!mLogger.hasStartedSession() && mMainStageListener.mHasChildren