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

Commit 634b04de authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set parent on animation-background before building" into main

parents 71ee7d85 e4c0cf0f

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

+3 −2
Original line number Diff line number Diff line
@@ -594,7 +594,6 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                    .setName("animation-background")

                    .setCallsite("DefaultTransitionHandler")

                    .setColorLayer();

            final SurfaceControl backgroundSurface = colorLayerBuilder.build();



            // Attaching the background surface to the transition root could unexpectedly make it

            // cover one of the split root tasks. To avoid this, put the background surface just
@@ -605,8 +604,10 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
            if (isSplitTaskInvolved) {

                mRootTDAOrganizer.attachToDisplayArea(displayId, colorLayerBuilder);

            } else {

                startTransaction.reparent(backgroundSurface, info.getRootLeash());

                colorLayerBuilder.setParent(info.getRootLeash());

            }



            final SurfaceControl backgroundSurface = colorLayerBuilder.build();

            startTransaction.setColor(backgroundSurface, colorArray)

                    .setLayer(backgroundSurface, -1)

                    .show(backgroundSurface);