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

Commit 9e485eaf authored by Chilun Huang's avatar Chilun Huang Committed by Automerger Merge Worker
Browse files

Merge "Apply transaction before calling onFinish" into udc-dev am: b594f7e0 

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



Change-Id: Ib01a24dba6b5e7edc51fa7238b23a45a40f90619
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 235dbb80 b594f7e0

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

+2 −2
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ class SplitScreenTransitions { 
            mAnimatingTransition = transition;

            mFinishTransaction = finishTransaction;



            startTransaction.apply();



            final SplitDecorManager topDecor = mPendingDismiss.mDismissTop == STAGE_TYPE_MAIN

                    ? mainDecor : sideDecor;

            topDecor.fadeOutDecor(() -> {
@@ -200,8 +202,6 @@ class SplitScreenTransitions { 
                    onFinish(null /* wct */, null /* wctCB */);

                });

            });



            startTransaction.apply();

        } else {

            playAnimation(transition, info, startTransaction, finishTransaction,

                    finishCallback, mainRoot, sideRoot, topRoot);