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

Commit 4b45f29b authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge changes I5fee8996,Iad3d2f9e into main 

* changes:
  Do not apply finishTransaction in DTH
  Revert "Separate finishTransaction for leftover transition"
parents 3f4ab0a7 ac5f0dc6

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

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
        if (TransitionUtil.isAllNoAnimation(info) || TransitionUtil.isAllOrderOnly(info)

                || (info.getFlags() & WindowManager.TRANSIT_FLAG_INVISIBLE) != 0) {

            startTransaction.apply();

            finishTransaction.apply();

            // As a contract, finishTransaction should only be applied in Transitions#onFinish

            finishCallback.onTransitionFinished(null /* wct */);

            return true;

        }

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

+1 −4
Original line number Diff line number Diff line
@@ -161,13 +161,10 @@ public class MixedTransitionHelper { 
                pipHandler.startEnterAnimation(pipChange, startTransaction, finishTransaction,

                        finishCB);

            }

            // make a new finishTransaction because pip's startEnterAnimation "consumes" it so

            // we need a separate one to send over to launcher.

            SurfaceControl.Transaction otherFinishT = new SurfaceControl.Transaction();

            // Dispatch the rest of the transition normally. This will most-likely be taken by

            // recents or default handler.

            mixed.mLeftoversHandler = player.dispatchTransition(mixed.mTransition, everythingElse,

                    otherStartT, otherFinishT, finishCB, mixedHandler);

                    otherStartT, finishTransaction, finishCB, mixedHandler);

        } else {

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "  Not leaving split, so just "

                    + "forward animation to Pip-Handler.");