diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index b3e0dcee1e..6a8d66ddac 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -693,6 +693,7 @@ public class TaskView extends FrameLayout implements Reusable { TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask); ActivityOptionsWrapper opts = mActivity.getActivityLaunchOptions(this, null); + opts.options.setLaunchDisplayId(getRootViewDisplayId()); boolean isOldTaskSplit = LauncherSplitScreenListener.INSTANCE.getNoCreate() .getPersistentSplitIds().length > 0; if (ActivityManagerWrapper.getInstance() @@ -738,6 +739,7 @@ public class TaskView extends FrameLayout implements Reusable { // Indicate success once the system has indicated that the transition has started ActivityOptions opts = ActivityOptionsCompat.makeCustomAnimation( getContext(), 0, 0, () -> callback.accept(true), MAIN_EXECUTOR.getHandler()); + opts.setLaunchDisplayId(getRootViewDisplayId()); if (freezeTaskList) { ActivityOptionsCompat.setFreezeRecentTasksList(opts); } @@ -1537,6 +1539,11 @@ public class TaskView extends FrameLayout implements Reusable { mDigitalWellBeingToast.setBannerColorTint(tintColor, amount); } + + private int getRootViewDisplayId() { + return getRootView().getDisplay().getDisplayId(); + } + /** * We update and subsequently draw these in {@link #setFullscreenProgress(float)}. */