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

Commit 483b379e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix issues related to clip rect used in animations" into tm-qpr-dev am: 1c9eb9fc 

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



Change-Id: Ic28f78a16608b0ade46dd055653c42b6cac28b87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2434d1de 1c9eb9fc

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+5 −3
Original line number Diff line number Diff line
@@ -472,8 +472,9 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                }



                final Rect clipRect = Transitions.isClosingType(change.getMode())

                        ? mRotator.getEndBoundsInStartRotation(change)

                        : change.getEndAbsBounds();

                        ? new Rect(mRotator.getEndBoundsInStartRotation(change))

                        : new Rect(change.getEndAbsBounds());

                clipRect.offsetTo(0, 0);



                if (delayedEdgeExtension) {

                    // If the edge extension needs to happen after the startTransition has been
@@ -973,7 +974,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 


    private static void applyTransformation(long time, SurfaceControl.Transaction t,

            SurfaceControl leash, Animation anim, Transformation transformation, float[] matrix,

            Point position, float cornerRadius, @Nullable Rect clipRect) {

            Point position, float cornerRadius, @Nullable Rect immutableClipRect) {

        anim.getTransformation(time, transformation);

        if (position != null) {

            transformation.getMatrix().postTranslate(position.x, position.y);
@@ -981,6 +982,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
        t.setMatrix(leash, transformation.getMatrix(), matrix);

        t.setAlpha(leash, transformation.getAlpha());



        final Rect clipRect = immutableClipRect == null ? null : new Rect(immutableClipRect);

        Insets extensionInsets = Insets.min(transformation.getInsets(), Insets.NONE);

        if (!extensionInsets.equals(Insets.NONE) && clipRect != null && !clipRect.isEmpty()) {

            // Clip out any overflowing edge extension