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

Merge "Ensure consistent stack behind PIP when going to/from fullscreen."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-11 23:20:33 +00:00
committed by Android (Google) Code Review
parent 768482ce59 0c1ca09dbb
commit 4d5f44f619
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2120,6 +2120,14 @@ public class ActivityStackSupervisor extends ConfigurationContainer
final int size = tasks.size();
if (onTop) {
for (int i = 0; i < size; i++) {
final TaskRecord task = tasks.get(i);
if (fromStackId == PINNED_STACK_ID) {
// Update the return-to to reflect where the pinned stack task was moved
// from so that we retain the stack that was previously visible if the
// pinned stack is recreated. See moveActivityToPinnedStackLocked().
task.setTaskToReturnTo(getFocusedStack().getStackId() == HOME_STACK_ID
? HOME_ACTIVITY_TYPE : APPLICATION_ACTIVITY_TYPE);
}
moveTaskToStackLocked(tasks.get(i).taskId,
FULLSCREEN_WORKSPACE_STACK_ID, onTop, onTop /*forceFocus*/,
"moveTasksToFullscreenStack", ANIMATE, DEFER_RESUME);