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

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

Browse Source 
Bug: 26118045
Change-Id: I106c698260b8215723ea1e50c654061464a1305f
This commit is contained in:
Wale Ogunwale
2015-12-11 14:56:37 -08:00
parent 248808e3b2
commit 285ccef697
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