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

DO NOT MERGE -- Adjust focus when moving task back

Browse Source 
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
This commit is contained in:
Andrii Kulian
2016-10-12 14:23:19 -07:00
parent d35d3c98e4
commit d4b98705b5
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;
} }