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

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

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

Merge "Cancel animating the divider bar after it being released" into tm-dev am: 98783193 am: 763cefe2

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



Change-Id: Ie942b19ad0b904e857dcd811d7afafb4344c6fd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd70303e 763cefe2

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

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

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

            mDividerFadeInAnimator.addUpdateListener(animation -> {

                if (dividerLeash == null) {

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

                    mDividerFadeInAnimator.cancel();

                    return;

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

                @Override

                public void onAnimationStart(Animator animation) {

                    if (dividerLeash == null) {

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

                        mDividerFadeInAnimator.cancel();

                        return;

                    }