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 "Fixing animation end not-called when cancelling state the animation recursively" into sc-dev

This commit is contained in:
Sunny Goyal 2021-06-21 22:32:23 +00:00 committed by Android (Google) Code Review
parent 82fc5c83a5 de644313b0
commit b3eafe97bb
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@ -2245,7 +2245,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
boolean shouldRemoveTask, long duration) {
if (mPendingAnimation != null) {
mPendingAnimation.createPlaybackController().dispatchOnCancel();
mPendingAnimation.createPlaybackController().dispatchOnCancel().dispatchOnEnd();
}
PendingAnimation anim = new PendingAnimation(duration);

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

@ -278,12 +278,19 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
}
}
public void dispatchOnStart() {
public AnimatorPlaybackController dispatchOnStart() {
callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationStart);
return this;
}
public void dispatchOnCancel() {
public AnimatorPlaybackController dispatchOnCancel() {
callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationCancel);
return this;
}
public AnimatorPlaybackController dispatchOnEnd() {
callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationEnd);
return this;
}
public void dispatchSetInterpolator(TimeInterpolator interpolator) {
@ -328,7 +335,7 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
public void onAnimationSuccess(Animator animator) {
// We wait for the spring (if any) to finish running before completing the end callback.
if (!mDispatched) {
callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationEnd);
dispatchOnEnd();
if (mEndAction != null) {
mEndAction.run();
}

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

@ -209,7 +209,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
// Cancel the current animation. This will reset mState to mCurrentStableState, so store it.
STATE_TYPE fromState = mState;
mConfig.reset();
cancelAnimation();
if (!animated) {
mAtomicAnimationFactory.cancelAllStateElementAnimation();
@ -303,7 +303,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
public AnimatorPlaybackController createAnimationToNewWorkspace(STATE_TYPE state,
StateAnimationConfig config) {
config.userControlled = true;
mConfig.reset();
cancelAnimation();
config.copyTo(mConfig);
mConfig.playbackController = createAnimationToNewWorkspaceInternal(state)
.createPlaybackController();
@ -393,6 +393,11 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
*/
public void cancelAnimation() {
mConfig.reset();
// It could happen that a new animation is set as a result of an endListener on the
// existing animation.
while (mConfig.currentAnimation != null || mConfig.playbackController != null) {
mConfig.reset();
}
}
public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
@ -508,14 +513,19 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
* Cancels the current animation and resets config variables.
*/
public void reset() {
AnimatorSet anim = currentAnimation;
AnimatorPlaybackController pc = playbackController;
DEFAULT.copyTo(this);
targetState = null;
currentAnimation = null;
playbackController = null;
changeId++;
if (playbackController != null) {
playbackController.getAnimationPlayer().cancel();
playbackController.dispatchOnCancel();
} else if (currentAnimation != null) {
AnimatorSet anim = currentAnimation;
if (pc != null) {
pc.getAnimationPlayer().cancel();
pc.dispatchOnCancel().dispatchOnEnd();
} else if (anim != null) {
anim.setDuration(0);
if (!anim.isStarted()) {
// If the animation is not started the listeners do not get notified,
@ -525,10 +535,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
}
anim.cancel();
}
currentAnimation = null;
playbackController = null;
changeId++;
}
@Override