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

Commit ebaab164 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Automerger Merge Worker
Browse files

Merge "Preserve the leash reference in PipTaskOrganizer" into udc-dev am: 36f3373f 

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



Change-Id: I4040b512b2a865c1985f198c996fc0b1e2a3c750
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b2ddaa0 36f3373f

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

+9 −16
Original line number Original line Diff line number Diff line
@@ -1018,25 +1018,18 @@ public class PipTransition extends PipTransitionController { 
    private void resetPrevPip(@NonNull TransitionInfo.Change prevPipTaskChange,

    private void resetPrevPip(@NonNull TransitionInfo.Change prevPipTaskChange,

            @NonNull SurfaceControl.Transaction startTransaction) {

            @NonNull SurfaceControl.Transaction startTransaction) {

        final SurfaceControl leash = prevPipTaskChange.getLeash();

        final SurfaceControl leash = prevPipTaskChange.getLeash();

        final Rect bounds = prevPipTaskChange.getEndAbsBounds();

        startTransaction.remove(leash);

        final Point offset = prevPipTaskChange.getEndRelOffset();

        bounds.offset(-offset.x, -offset.y);





        startTransaction.setWindowCrop(leash, null);

        startTransaction.setMatrix(leash, 1, 0, 0, 1);

        startTransaction.setCornerRadius(leash, 0);

        startTransaction.setPosition(leash, bounds.left, bounds.top);



        if (mHasFadeOut && prevPipTaskChange.getTaskInfo().isVisible()) {

            if (mPipAnimationController.getCurrentAnimator() != null) {

                mPipAnimationController.getCurrentAnimator().cancel();

            }

            startTransaction.setAlpha(leash, 1);

        }

        mHasFadeOut = false;

        mHasFadeOut = false;

        mCurrentPipTaskToken = null;

        mCurrentPipTaskToken = null;



        // clean-up the state in PipTaskOrganizer if the PipTaskOrganizer#onTaskAppeared() hasn't

        // been called yet with its leash reference now pointing to a new SurfaceControl not

        // matching the leash of the pip we are removing.

        if (mPipOrganizer.getSurfaceControl() == leash) {

            mPipOrganizer.onExitPipFinished(prevPipTaskChange.getTaskInfo());

            mPipOrganizer.onExitPipFinished(prevPipTaskChange.getTaskInfo());

        }

        }

    }





    @Override

    @Override

    public boolean syncPipSurfaceState(@NonNull TransitionInfo info,

    public boolean syncPipSurfaceState(@NonNull TransitionInfo info,