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

Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-13 04:47:44 +00:00
committed by Android (Google) Code Review
parent 1553d5411c d4b98705b5
commit 1fefc8b9fa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4406,7 +4406,7 @@ final class ActivityStack {
mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID); mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID);
if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) { if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) {
final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity(); final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity();
mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack"); mService.setFocusedActivityLocked(visibleBehind, "moveHomeTaskToBack");
mStackSupervisor.resumeFocusedStackTopActivityLocked(); mStackSupervisor.resumeFocusedStackTopActivityLocked();
return true; return true;
} }
@@ -4459,9 +4459,11 @@ final class ActivityStack {
} }
final int taskToReturnTo = tr.getTaskToReturnTo(); final int taskToReturnTo = tr.getTaskToReturnTo();
tr.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE); tr.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE);
return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null, "moveTaskToBack"); return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null,
"moveTaskToBackAndShowHome");
} }
adjustFocusedActivityLocked(mResumedActivity, "moveTaskToBack");
mStackSupervisor.resumeFocusedStackTopActivityLocked(); mStackSupervisor.resumeFocusedStackTopActivityLocked();
return true; return true;
} }