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

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

Change-Id: Ie942b19ad0b904e857dcd811d7afafb4344c6fd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-12 12:50:42 +00:00
committed by Automerger Merge Worker

View File

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