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

Commit 08aeb56d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Reset original task surface after reparenting to PiP" into... 

Merge "Merge "Reset original task surface after reparenting to PiP" into tm-qpr-dev am: f6970011" into tm-qpr-dev-plus-aosp
parents ddcbcb0e 155c8180

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

+3 −0
Original line number Diff line number Diff line
@@ -2048,6 +2048,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                            task.mLastRecentsAnimationTransaction,

                            task.mLastRecentsAnimationOverlay);

                    task.clearLastRecentsAnimationTransaction(false /* forceRemoveOverlay */);

                } else {

                    // Reset the original task surface

                    task.resetSurfaceControlTransforms();

                }



                // The organized TaskFragment is becoming empty because this activity is reparented

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

+6 −1
Original line number Diff line number Diff line
@@ -5975,8 +5975,13 @@ class Task extends TaskFragment { 
        mLastRecentsAnimationTransaction = null;

        mLastRecentsAnimationOverlay = null;

        // reset also the crop and transform introduced by mLastRecentsAnimationTransaction

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

        resetSurfaceControlTransforms();

    }



    void resetSurfaceControlTransforms() {

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

                .setWindowCrop(mSurfaceControl, null)

                .setShadowRadius(mSurfaceControl, 0)

                .setCornerRadius(mSurfaceControl, 0);

    }