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

Merge "Don't update task to return to type for last task over home" into nyc-dev

Browse Source
This commit is contained in:
Andrii Kulian
2016-06-13 21:55:46 +00:00
committed by Android (Google) Code Review
parent a5e2aa99c0 21893824c1
commit 62b08eb5f2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -2581,11 +2581,14 @@ final class ActivityStack {
} }
private void insertTaskAtTop(TaskRecord task, ActivityRecord newActivity) { private void insertTaskAtTop(TaskRecord task, ActivityRecord newActivity) {
boolean isLastTaskOverHome = false;
// If the moving task is over home stack, transfer its return type to next task // If the moving task is over home stack, transfer its return type to next task
if (task.isOverHomeStack()) { if (task.isOverHomeStack()) {
final TaskRecord nextTask = getNextTask(task); final TaskRecord nextTask = getNextTask(task);
if (nextTask != null) { if (nextTask != null) {
nextTask.setTaskToReturnTo(task.getTaskToReturnTo()); nextTask.setTaskToReturnTo(task.getTaskToReturnTo());
} else {
isLastTaskOverHome = true;
} }
} }
@@ -2595,7 +2598,10 @@ final class ActivityStack {
ActivityStack lastStack = mStackSupervisor.getLastStack(); ActivityStack lastStack = mStackSupervisor.getLastStack();
final boolean fromHome = lastStack.isHomeStack(); final boolean fromHome = lastStack.isHomeStack();
if (!isHomeStack() && (fromHome || topTask() != task)) { if (!isHomeStack() && (fromHome || topTask() != task)) {
int returnToType = APPLICATION_ACTIVITY_TYPE; // If it's a last task over home - we default to keep its return to type not to
// make underlying task focused when this one will be finished.
int returnToType = isLastTaskOverHome
? task.getTaskToReturnTo() : APPLICATION_ACTIVITY_TYPE;
if (fromHome && StackId.allowTopTaskToReturnHome(mStackId)) { if (fromHome && StackId.allowTopTaskToReturnHome(mStackId)) {
returnToType = lastStack.topTask() == null returnToType = lastStack.topTask() == null
? HOME_ACTIVITY_TYPE : lastStack.topTask().taskType; ? HOME_ACTIVITY_TYPE : lastStack.topTask().taskType;