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

Fix not able to launch activity adjacently

Browse Source 
Make it considers launch flags when finding launch root for existing
activity and add back set launch adjacent flag root task logic which was
accidently removed by Ie259abc1.

Fix: 204578587
Test: launch new/existing activity with launch-adjacent-flag will launch
      into split root and trigger split screen.
Test: passed existing tests
Change-Id: I0e637c198de9c7b08e27864771cebd951e4fdac2
This commit is contained in:
Jerry Chang
2021-11-29 16:32:03 +08:00
parent c35cf07c60
commit 565c0b23ec
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,6 +768,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
final WindowContainerTransaction wct = new WindowContainerTransaction();
// Make the stages adjacent to each other so they occlude what's behind them.
wct.setAdjacentRoots(mMainStage.mRootTaskInfo.token, mSideStage.mRootTaskInfo.token);
wct.setLaunchAdjacentFlagRoot(mSideStage.mRootTaskInfo.token);
mTaskOrganizer.applyTransaction(wct);
}
}
@@ -775,6 +776,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
private void onStageRootTaskVanished(StageListenerImpl stageListener) {
if (stageListener == mMainStageListener || stageListener == mSideStageListener) {
final WindowContainerTransaction wct = new WindowContainerTransaction();
wct.clearLaunchAdjacentFlagRoot(mSideStage.mRootTaskInfo.token);
// Deactivate the main stage if it no longer has a root task.
mMainStage.deactivate(wct);
mTaskOrganizer.applyTransaction(wct);

4
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2741,8 +2741,8 @@ class ActivityStarter {
// If it exist, we need to reparent target root task from TDA to launch root task.
final TaskDisplayArea tda = mTargetRootTask.getDisplayArea();
final Task launchRootTask = tda.getLaunchRootTask(mTargetRootTask.getWindowingMode(),
mTargetRootTask.getActivityType(), null /** options */,
mSourceRootTask, 0 /** launchFlags */);
mTargetRootTask.getActivityType(), null /** options */, mSourceRootTask,
mLaunchFlags);
// If target root task is created by organizer, let organizer handle reparent itself.
if (!mTargetRootTask.mCreatedByOrganizer && launchRootTask != null
&& launchRootTask != mTargetRootTask) {