Fixing stateManager not correctly deduping existing animations (a6616dec) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/LauncherStateManager.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -374,7 +374,18 @@ public class LauncherStateManager {
		*/
		public void setCurrentAnimation(AnimatorSet anim, Animator... childAnimations) {
		for (Animator childAnim : childAnimations) {
		if (childAnim != null && mConfig.mCurrentAnimation == childAnim) {
		if (childAnim == null) {
		continue;
		}
		if (mConfig.playbackController != null
		&& mConfig.playbackController.getTarget() == childAnim) {
		if (mConfig.mCurrentAnimation != null) {
		mConfig.mCurrentAnimation.removeListener(mConfig);
		mConfig.mCurrentAnimation = null;
		}
		mConfig.playbackController = null;
		break;
		} else if (mConfig.mCurrentAnimation == childAnim) {
		mConfig.mCurrentAnimation.removeListener(mConfig);
		mConfig.mCurrentAnimation = null;
		break;