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

Commit 569fcc2d authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Do not use sync on divider visibility changed." into tm-qpr-dev am:... 

Merge "Do not use sync on divider visibility changed." into tm-qpr-dev am: e94ac0c5 am: b3ca6fd8

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



Change-Id: I2c14fec050065341ab5e39d840b61355e1cbbeb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89c1efe4 b3ca6fd8

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

+5 −3
Original line number Diff line number Diff line
@@ -1705,9 +1705,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }



        mSyncQueue.queue(wct);

        mSyncQueue.runInSync(t -> {

            setDividerVisibility(mainStageVisible, t);

        });

        setDividerVisibility(mainStageVisible, null);

    }



    private void setDividerVisibility(boolean visible, @Nullable SurfaceControl.Transaction t) {
@@ -1789,6 +1787,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


                @Override

                public void onAnimationEnd(Animator animation) {

                    if (dividerLeash != null && dividerLeash.isValid()) {

                        transaction.setAlpha(dividerLeash, 1);

                        transaction.apply();

                    }

                    mTransactionPool.release(transaction);

                    mDividerFadeInAnimator = null;

                }