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

Commit 98783193 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cancel animating the divider bar after it being released" into tm-dev

parents 8cdbd6c0 1882b18a

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1115,7 +1115,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            final SurfaceControl.Transaction transaction = mTransactionPool.acquire();

            final SurfaceControl.Transaction transaction = mTransactionPool.acquire();

            mDividerFadeInAnimator = ValueAnimator.ofFloat(0f, 1f);

            mDividerFadeInAnimator = ValueAnimator.ofFloat(0f, 1f);

            mDividerFadeInAnimator.addUpdateListener(animation -> {

            mDividerFadeInAnimator.addUpdateListener(animation -> {

                if (dividerLeash == null) {

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

                    mDividerFadeInAnimator.cancel();

                    mDividerFadeInAnimator.cancel();

                    return;

                    return;

                }

                }
@@ -1125,7 +1125,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mDividerFadeInAnimator.addListener(new AnimatorListenerAdapter() {

            mDividerFadeInAnimator.addListener(new AnimatorListenerAdapter() {

                @Override

                @Override

                public void onAnimationStart(Animator animation) {

                public void onAnimationStart(Animator animation) {

                    if (dividerLeash == null) {

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

                        mDividerFadeInAnimator.cancel();

                        mDividerFadeInAnimator.cancel();

                        return;

                        return;

                    }

                    }