Merge "Revert "Move/Launch task on the TaskView's display."" into sc-v2-dev

quickstep/src/com/android/quickstep/views/TaskView.java

@@ -674,7 +674,6 @@ public class TaskView extends FrameLayout implements Reusable {
             TestLogging.recordEvent(
                     TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
             ActivityOptionsWrapper opts =  mActivity.getActivityLaunchOptions(this, null);
-            opts.options.setLaunchDisplayId(getRootViewDisplayId());
             if (ActivityManagerWrapper.getInstance()
                     .startActivityFromRecents(mTask.key, opts.options)) {
                 RecentsView recentsView = getRecentsView();
@@ -715,7 +714,6 @@ 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);
             }
@@ -1528,10 +1526,6 @@ 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)}.
      */