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

Commit f43c57d0 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I904ddd6c46e369c074d5fd8a19b80a053e7a5dce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6fadffb 1245b9b7

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+2 −1
Original line number Diff line number Diff line
@@ -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;