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

Commit 6a53ef56 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 am: 98783193 

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



Change-Id: Ic1e086e5cd37c1b983ffa08c31832b92215599db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03a4bc05 98783193

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 @@ 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 @@ 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;

                    }