openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019

Change-Id: I881785a2a1e96aebbd10e148e9f46cda3cee603d
This commit is contained in:
TreeHugger Robot 2021-06-14 19:33:41 +00:00 committed by Automerger Merge Worker
parent 7b57deb534 012e978e31
commit 38e3dbe38e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/launcher3/anim/AnimatorPlaybackController.java
View File

@ -290,7 +290,10 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
callAnimatorCommandRecursively(mAnim, a -> a.setInterpolator(interpolator));
}
private static void callListenerCommandRecursively(
/**
* Recursively calls a command on all the listeners of the provided animation
*/
public static void callListenerCommandRecursively(
Animator anim, BiConsumer<AnimatorListener, Animator> command) {
callAnimatorCommandRecursively(anim, a-> {
for (AnimatorListener l : nonNullList(a.getListeners())) {

12
src/com/android/launcher3/statemanager/StateManager.java
View File

@ -18,6 +18,7 @@ package com.android.launcher3.statemanager;
import static android.animation.ValueAnimator.areAnimatorsEnabled;
import static com.android.launcher3.anim.AnimatorPlaybackController.callListenerCommandRecursively;
import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
import android.animation.Animator;
@ -514,8 +515,15 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
playbackController.getAnimationPlayer().cancel();
playbackController.dispatchOnCancel();
} else if (currentAnimation != null) {
currentAnimation.setDuration(0);
currentAnimation.cancel();
AnimatorSet anim = currentAnimation;
anim.setDuration(0);
if (!anim.isStarted()) {
// If the animation is not started the listeners do not get notified,
// notify manually.
callListenerCommandRecursively(anim, AnimatorListener::onAnimationCancel);
callListenerCommandRecursively(anim, AnimatorListener::onAnimationEnd);
}
anim.cancel();
}
currentAnimation = null;