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

Commit 40d596ee authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Fix regressions with reparenting task am: 27475c6e 

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

Change-Id: I70698c2bb96c2f620e112eed7ce15a88ce1e2592
parents 21945f3e 27475c6e

services/core/java/com/android/server/wm/Task.java

+10 −4
Original line number Diff line number Diff line
@@ -7653,17 +7653,23 @@ class Task extends WindowContainer<WindowContainer> { 
    void clearLastRecentsAnimationTransaction() {

        mLastRecentsAnimationTransaction = null;

        mLastRecentsAnimationOverlay = null;

        // reset also the transform introduced by mLastRecentsAnimationTransaction

        getPendingTransaction().setMatrix(mSurfaceControl, Matrix.IDENTITY_MATRIX, new float[9]);

        // reset also the crop and transform introduced by mLastRecentsAnimationTransaction

        Rect bounds = getBounds();

        getPendingTransaction().setMatrix(mSurfaceControl, Matrix.IDENTITY_MATRIX, new float[9])

                .setWindowCrop(mSurfaceControl, bounds.width(), bounds.height());

    }



    void maybeApplyLastRecentsAnimationTransaction() {

        if (mLastRecentsAnimationTransaction != null) {

            final SurfaceControl.Transaction tx = getPendingTransaction();

            if (mLastRecentsAnimationOverlay != null) {

                getPendingTransaction().reparent(mLastRecentsAnimationOverlay, mSurfaceControl);

                tx.reparent(mLastRecentsAnimationOverlay, mSurfaceControl);

            }

            PictureInPictureSurfaceTransaction.apply(mLastRecentsAnimationTransaction,

                    mSurfaceControl, getPendingTransaction());

                    mSurfaceControl, tx);

            // If we are transferring the transform from the root task entering PIP, then also show

            // the new task immediately

            tx.show(mSurfaceControl);

            mLastRecentsAnimationTransaction = null;

            mLastRecentsAnimationOverlay = null;

        }