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

Merge "When entering PIP with multi-activity, re-use mLastNonFullscreenBounds." into rvc-dev am: 059531924e am: e046407ad0

Browse Source 
Change-Id: Iafae93841e1be835cc5579f5f1d95361e6dca1d3
This commit is contained in:
TreeHugger Robot
2020-05-16 02:18:59 +00:00
committed by Automerger Merge Worker
parent e43bd566f7 e046407ad0
commit 5c646cae14
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2176,6 +2176,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
// move the PIP activity into the task.
stack = taskDisplayArea.createStack(WINDOWING_MODE_UNDEFINED, r.getActivityType(),
ON_TOP, r.info, r.intent, false /* createdByOrganizer */);
// It's possible the task entering PIP is in freeform, so save the last
// non-fullscreen bounds. Then when this new PIP task exits PIP, it can restore
// to its previous freeform bounds.
stack.setLastNonFullscreenBounds(task.mLastNonFullscreenBounds);
// There are multiple activities in the task and moving the top activity should
// reveal/leave the other activities in their original task.