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

Commit 3662d9ac authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "Make animation leashes effect layers" into rvc-dev am: 215bb80b am:... 

Merge "Make animation leashes effect layers" into rvc-dev am: 215bb80b am: 0560dba8 am: 761f9cda

Change-Id: Ia12a57f5866bb159877e8410f9ac87e826ddb88d
parents b898a79b 761f9cda

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

+3 −1
Original line number Diff line number Diff line
@@ -379,7 +379,8 @@ class SurfaceAnimator { 
        if (DEBUG_ANIM) Slog.i(TAG, "Reparenting to leash");

        final SurfaceControl.Builder builder = animatable.makeAnimationLeash()

                .setParent(animatable.getAnimationLeashParent())

                .setName(surface + " - animation-leash");

                .setName(surface + " - animation-leash")

                .setColorLayer();

        final SurfaceControl leash = builder.build();

        if (!hidden) {

            // TODO(b/151665759) Defer reparent calls
@@ -390,6 +391,7 @@ class SurfaceAnimator { 
            // seamless rotation.

            transactionFactory.get().unsetColor(leash).show(leash).apply();

        }

        t.unsetColor(leash);

        t.setWindowCrop(leash, width, height);

        t.setPosition(leash, x, y);

        t.show(leash);