Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-12 12:05:59 +00:00
committed by Android (Google) Code Review
parent 8cdbd6c00a 1882b18a66
commit 9878319331
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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