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

Commit 29cdf2a6 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Make sure both transition start/end callback sent" into main

parents 7f059781 0898cdf6

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

+3 −1
Original line number Diff line number Diff line
@@ -496,7 +496,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "startSwipePipToHome: %s, state=%s", componentName, mPipTransitionState);

        mPipTransitionState.setInSwipePipToHomeTransition(true);

        if (!ENABLE_SHELL_TRANSITIONS) {

            sendOnPipTransitionStarted(TRANSITION_DIRECTION_TO_PIP);

        }

        setBoundsStateForEntry(componentName, pictureInPictureParams, activityInfo);

        return mPipBoundsAlgorithm.getEntryDestinationBounds();

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ public class PipTransition extends PipTransitionController { 
        }



        final Rect sourceBounds = pipTaskInfo.configuration.windowConfiguration.getBounds();

        sendOnPipTransitionStarted(TRANSITION_DIRECTION_TO_PIP);

        final PipAnimationController.PipTransitionAnimator animator =

                mPipAnimationController.getAnimator(pipTaskInfo, leash, sourceBounds, sourceBounds,

                        destinationBounds, sourceHintRect, TRANSITION_DIRECTION_TO_PIP,