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

Merge "Move activity to display on launch" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-28 22:52:56 +00:00
committed by Android (Google) Code Review
parent 479bb430d1 fab9cd89ee
commit 5c5bf24033
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -1465,6 +1465,12 @@ class ActivityStarter {
return intentActivity; return intentActivity;
} }
/**
* Figure out which task and activity to bring to front when we have found an existing matching
* activity record in history. May also clear the task if needed.
* @param intentActivity Existing matching activity.
* @return {@link ActivityRecord} brought to front.
*/
private ActivityRecord setTargetStackAndMoveToFrontIfNeeded(ActivityRecord intentActivity) { private ActivityRecord setTargetStackAndMoveToFrontIfNeeded(ActivityRecord intentActivity) {
mTargetStack = intentActivity.getStack(); mTargetStack = intentActivity.getStack();
mTargetStack.mLastPausedActivity = null; mTargetStack.mLastPausedActivity = null;
@@ -1526,6 +1532,14 @@ class ActivityStarter {
"bringToFrontInsteadOfAdjacentLaunch"); "bringToFrontInsteadOfAdjacentLaunch");
} }
mMovedToFront = true; mMovedToFront = true;
} else if (launchStack.mDisplayId != mTargetStack.mDisplayId) {
// Target and computed stacks are on different displays and we've
// found a matching task - move the existing instance to that display and
// move it to front.
intentActivity.task.reparent(launchStack.mStackId, ON_TOP,
REPARENT_MOVE_STACK_TO_FRONT, ANIMATE, DEFER_RESUME,
"reparentToDisplay");
mMovedToFront = true;
} }
mOptions = null; mOptions = null;