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

Merge "Move focus to visible behind activity when we move the home task back"

Browse Source
This commit is contained in:
Wale Ogunwale
2015-12-12 01:03:49 +00:00
committed by Android (Google) Code Review
parent 9a2b9f61a3 285ccef697
commit f026f82fb5
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/ActivityStack.java
View File

@@ -3992,6 +3992,20 @@ final class ActivityStack {
if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + taskId);
if (mStackId == HOME_STACK_ID && topTask().isHomeTask()) {
// For the case where we are moving the home task back and there is an activity visible
// behind it on the fullscreen stack, we want to move the focus to the visible behind
// activity to maintain order with what the user is seeing.
final ActivityStack fullscreenStack =
mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID);
if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) {
final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity();
mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack");
mStackSupervisor.resumeTopActivitiesLocked(fullscreenStack, null, null);
return true;
}
}
boolean prevIsHome = false;
// If true, we should resume the home activity next if the task we are moving to the