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

Merge "Reparent PiP overlay under task as soon as possible" into udc-dev am: ccafc6b32d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23732847

Change-Id: I6f195856b8c973bc7e48826fe61c4769f3ee2d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2023-06-21 21:06:11 +00:00
committed by Automerger Merge Worker
parent d265fc4c55 ccafc6b32d
commit 493959cab9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -447,7 +447,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
} }
/** /**
* Callback when launcher finishes swipe-pip-to-home operation. * Callback when launcher finishes preparation of swipe-pip-to-home operation.
* Expect {@link #onTaskAppeared(ActivityManager.RunningTaskInfo, SurfaceControl)} afterwards. * Expect {@link #onTaskAppeared(ActivityManager.RunningTaskInfo, SurfaceControl)} afterwards.
*/ */
public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds,

3
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
View File

@@ -953,7 +953,8 @@ public class PipTransition extends PipTransitionController {
if (swipePipToHomeOverlay != null) { if (swipePipToHomeOverlay != null) {
// Launcher fade in the overlay on top of the fullscreen Task. It is possible we // Launcher fade in the overlay on top of the fullscreen Task. It is possible we
// reparent the PIP activity to a new PIP task (in case there are other activities // reparent the PIP activity to a new PIP task (in case there are other activities
// in the original Task), so we should also reparent the overlay to the PIP task. // in the original Task, in other words multi-activity apps), so we should also reparent
// the overlay to the final PIP task.
startTransaction.reparent(swipePipToHomeOverlay, leash) startTransaction.reparent(swipePipToHomeOverlay, leash)
.setLayer(swipePipToHomeOverlay, Integer.MAX_VALUE); .setLayer(swipePipToHomeOverlay, Integer.MAX_VALUE);
mPipOrganizer.mSwipePipToHomeOverlay = null; mPipOrganizer.mSwipePipToHomeOverlay = null;