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

Commit 47ff7e31 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Revert "Separate finishTransaction for leftover transition" 

This reverts commit ff188280.

Reason for revert: b/374917938

Change-Id: Iad3d2f9e0813f0edc0a4bd6344add3b54cb9a2b9
parent 1427b5b5

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.");

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

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

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 312446524)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Test

    @FlakyTest(bugId = 336510055)