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

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

Merge "Separate finishTransaction for leftover transition" into main

parents f5429b94 ff188280

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

+4 −1
Original line number Diff line number Diff line
@@ -141,10 +141,13 @@ public class MixedTransitionHelper { 
            pipHandler.setEnterAnimationType(ANIM_TYPE_ALPHA);

            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, finishTransaction, finishCB, mixedHandler);

                    otherStartT, otherFinishT, finishCB, mixedHandler);

        } else {

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

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

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -182,12 +182,6 @@ class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : 
        }

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 312446524)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Test

    @FlakyTest(bugId = 336510055)