Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14fc5bbc authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Get display id from display instead of the display of root view" into tm-dev

parents 63e40707 5a915fb8

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

+4 −2
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ public class TaskView extends FrameLayout implements Reusable { 
            TestLogging.recordEvent(

                    TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);

            ActivityOptionsWrapper opts =  mActivity.getActivityLaunchOptions(this, null);

            opts.options.setLaunchDisplayId(getRootViewDisplayId());

            opts.options.setLaunchDisplayId(

                    getDisplay() == null ? DEFAULT_DISPLAY : getDisplay().getDisplayId());

            if (ActivityManagerWrapper.getInstance()

                    .startActivityFromRecents(mTask.key, opts.options)) {

                RecentsView recentsView = getRecentsView();
@@ -766,7 +767,8 @@ 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());

            opts.setLaunchDisplayId(

                    getDisplay() == null ? DEFAULT_DISPLAY : getDisplay().getDisplayId());

            if (freezeTaskList) {

                ActivityOptionsCompat.setFreezeRecentTasksList(opts);

            }