diff options
| author | 2023-06-21 21:06:11 +0000 | |
|---|---|---|
| committer | 2023-06-21 21:06:11 +0000 | |
| commit | 493959cab9d1ada0544852034e20ea5cad202287 (patch) | |
| tree | 092c255432fa18c3bb1beff4ddcc9364a3f8d2f9 | |
| parent | d265fc4c557d30fb7e8b97da3ef416bbd4cb1c9f (diff) | |
| parent | ccafc6b32dc1f1874eabcdb6ec28e820f9d95982 (diff) | |
Merge "Reparent PiP overlay under task as soon as possible" into udc-dev am: ccafc6b32d
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>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 2 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index cf389905c526..b14c3c10846b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -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. */ public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java index e04e9f7caa91..b8407c465741 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java @@ -953,7 +953,8 @@ public class PipTransition extends PipTransitionController { if (swipePipToHomeOverlay != null) { // 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 - // 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) .setLayer(swipePipToHomeOverlay, Integer.MAX_VALUE); mPipOrganizer.mSwipePipToHomeOverlay = null; |