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

Commit de2fcaf2 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Use correct root leash if PiP is the only target" into main

parents e0107043 4d5fa9fd
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -2890,6 +2890,13 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
                    leashReference = leashReference.getParent();
                }
            }
            if (wc == leashReference
                    && sortedTargets.get(i).mWindowingMode == WINDOWING_MODE_PINNED) {
                // If a PiP task is the only target, we wanna make sure the transition root leash
                // is at the top in case PiP is sent to back. This is done because a pinned task is
                // meant to be always-on-top throughout a transition.
                leashReference = ancestor.getTopChild();
            }
            final SurfaceControl rootLeash = leashReference.makeAnimationLeash().setName(
                    "Transition Root: " + leashReference.getName())
                    .setCallsite("Transition.calculateTransitionRoots").build();