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

Commit 2d77e53b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent starting split pending transition when it exists" into udc-dev am: 56557a6f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22221903



Change-Id: Ib42fc23e19183bfbb71bacf9b6f35ee0f1e5d2ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 125beddf 56557a6f

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java

+11 −0
Original line number Diff line number Diff line
@@ -296,6 +296,11 @@ class SplitScreenTransitions { 
            Transitions.TransitionHandler handler,

            @Nullable TransitionConsumedCallback consumedCallback,

            @Nullable TransitionFinishedCallback finishedCallback) {

        if (mPendingEnter != null) {

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "  splitTransition "

                    + " skip to start enter split transition since it already exist. ");

            return null;

        }

        final IBinder transition = mTransitions.startTransition(transitType, wct, handler);

        setEnterTransition(transition, remoteTransition, consumedCallback, finishedCallback);

        return transition;
@@ -323,6 +328,12 @@ class SplitScreenTransitions { 
    IBinder startDismissTransition(WindowContainerTransaction wct,

            Transitions.TransitionHandler handler, @SplitScreen.StageType int dismissTop,

            @SplitScreenController.ExitReason int reason) {

        if (mPendingDismiss != null) {

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "  splitTransition "

                    + " skip to start dismiss split transition since it already exist. reason to "

                    + " dismiss = %s", exitReasonToString(reason));

            return null;

        }

        final int type = reason == EXIT_REASON_DRAG_DIVIDER

                ? TRANSIT_SPLIT_DISMISS_SNAP : TRANSIT_SPLIT_DISMISS;

        IBinder transition = mTransitions.startTransition(type, wct, handler);