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

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

Merge "Always make final activity leash crop null" into main

parents 3564181e 931e3dbf

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/transition/PipExpandHandler.java

+3 −2
Original line number Diff line number Diff line
@@ -237,10 +237,11 @@ public class PipExpandHandler implements Transitions.TransitionHandler { 


        final TransitionInfo.Change finalPipChange = pipChange;

        animator.setAnimationEndCallback(() -> {

            if (parentBeforePip != null) {

                // TODO b/377362511: Animate local leash instead to also handle letterbox case.

            if (finalPipChange.getTaskInfo() == null) {

                // For multi-activity, set the crop to be null

                finishTransaction.setCrop(pipLeash, null);

            }

            if (parentBeforePip != null) {

                setupMultiActivityAnimationFinalState(finishTransaction, finalPipChange, pipLeash,

                        parentBeforePip);

            }