From d4b98705b5e0593587901b8b21b4ed282675b697 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Wed, 12 Oct 2016 14:23:19 -0700 Subject: DO NOT MERGE -- Adjust focus when moving task back Resumed and focused activity should be adjusted simultaneously. This was missing when task was moved back and focus was adjusted only after previous activity stopped. Bug: 31983988 Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361 --- services/core/java/com/android/server/am/ActivityStack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 1b552b5375e7..8c07e01d1163 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -4406,7 +4406,7 @@ final class ActivityStack { mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID); if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) { final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity(); - mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack"); + mService.setFocusedActivityLocked(visibleBehind, "moveHomeTaskToBack"); mStackSupervisor.resumeFocusedStackTopActivityLocked(); return true; } @@ -4459,9 +4459,11 @@ final class ActivityStack { } final int taskToReturnTo = tr.getTaskToReturnTo(); tr.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE); - return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null, "moveTaskToBack"); + return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null, + "moveTaskToBackAndShowHome"); } + adjustFocusedActivityLocked(mResumedActivity, "moveTaskToBack"); mStackSupervisor.resumeFocusedStackTopActivityLocked(); return true; } -- cgit v1.2.3-59-g8ed1b