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

Commit e6834970 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support to launch the matching task into a closer adjacent target task" into tm-qpr-dev

parents 39cf0dcd deaad423
Loading
Loading
Loading
Loading
+9 −11
Original line number Diff line number Diff line
@@ -2754,18 +2754,16 @@ class ActivityStarter {
                mTargetRootTask = getOrCreateRootTask(mStartActivity, mLaunchFlags, intentTask,
                        mOptions);
            }
        } else {
            // If a launch target indicated, and the matching task is already in the adjacent task
            // of the launch target. Adjust to use the adjacent task as its launch target. So the
            // existing task will be launched into the closer one and won't be reparent redundantly.
            // TODO(b/231541706): Migrate the logic to wm-shell after having proper APIs to help
            //  resolve target task without actually starting the activity.
        }

        // If the matching task is already in the adjacent task of the launch target. Adjust to use
        // the adjacent task as its launch target. So the existing task will be launched into the
        // closer one and won't be reparent redundantly.
        final Task adjacentTargetTask = mTargetRootTask.getAdjacentTaskFragment() != null
                ? mTargetRootTask.getAdjacentTaskFragment().asTask() : null;
        if (adjacentTargetTask != null && intentActivity.isDescendantOf(adjacentTargetTask)) {
            mTargetRootTask = adjacentTargetTask;
        }
        }

        // If the target task is not in the front, then we need to bring it to the front...
        // except...  well, with SINGLE_TASK_LAUNCH it's not entirely clear. We'd like to have