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

Merge "Fix stuck when fullscreen launch" into udc-dev

Browse Source
This commit is contained in:
Tony Huang
2023-06-02 09:26:21 +00:00
committed by Android (Google) Code Review
parent dfde2d6346 9d87c6c680
commit 7ed6f0bae6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,6 +579,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mRecentTasks.get().removeSplitPair(taskId1); mRecentTasks.get().removeSplitPair(taskId1);
} }
options1 = options1 != null ? options1 : new Bundle(); options1 = options1 != null ? options1 : new Bundle();
addActivityOptions(options1, null);
wct.startTask(taskId1, options1); wct.startTask(taskId1, options1);
mSplitTransitions.startFullscreenTransition(wct, remoteTransition); mSplitTransitions.startFullscreenTransition(wct, remoteTransition);
return; return;
@@ -600,6 +601,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
if (taskId == INVALID_TASK_ID) { if (taskId == INVALID_TASK_ID) {
options1 = options1 != null ? options1 : new Bundle(); options1 = options1 != null ? options1 : new Bundle();
addActivityOptions(options1, null);
wct.sendPendingIntent(pendingIntent, fillInIntent, options1); wct.sendPendingIntent(pendingIntent, fillInIntent, options1);
mSplitTransitions.startFullscreenTransition(wct, remoteTransition); mSplitTransitions.startFullscreenTransition(wct, remoteTransition);
return; return;
@@ -620,6 +622,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
if (taskId == INVALID_TASK_ID) { if (taskId == INVALID_TASK_ID) {
options1 = options1 != null ? options1 : new Bundle(); options1 = options1 != null ? options1 : new Bundle();
addActivityOptions(options1, null);
wct.startShortcut(mContext.getPackageName(), shortcutInfo, options1); wct.startShortcut(mContext.getPackageName(), shortcutInfo, options1);
mSplitTransitions.startFullscreenTransition(wct, remoteTransition); mSplitTransitions.startFullscreenTransition(wct, remoteTransition);
return; return;
@@ -678,6 +681,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
if (pendingIntent2 == null) { if (pendingIntent2 == null) {
options1 = options1 != null ? options1 : new Bundle(); options1 = options1 != null ? options1 : new Bundle();
addActivityOptions(options1, null);
if (shortcutInfo1 != null) { if (shortcutInfo1 != null) {
wct.startShortcut(mContext.getPackageName(), shortcutInfo1, options1); wct.startShortcut(mContext.getPackageName(), shortcutInfo1, options1);
} else { } else {