Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9bfd585 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "When entering PIP with multi-activity, re-use... 

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

Change-Id: I74bc2a2d3b7eace54adad6e9aafc6c135e12a63e
parents dcf9db47 05953192

services/core/java/com/android/server/wm/RootWindowContainer.java

+4 −0
Original line number Diff line number Diff line
@@ -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.