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

Commit 9b7dd148 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 08aeb56d

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



Change-Id: Ie1d94ebc95ff3b10d280d86f1ecdb3081f317aa5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47f233b1 08aeb56d

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);

    }