commit a8a889b77f63805d3b5da69a0d4087c913e6d8ce
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 08 16:16:32 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 08 16:16:32 2018 +0000
tree c85f1328369e8a177f249020b4ae4ec5887ab1c6
parent 0cce4300aa67c702651d50989351ed105d22504c
parent a6616dec286e2f70b6136aa8f03443157d5e21ea

[automerger] Fixing stateManager not correctly deduping existing animations am: a6616dec28

Change-Id: Ie76b586874121a8e0fb539b373cfc7c2c1e9032c

src/com/android/launcher3/LauncherStateManager.java

diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 7f25301..1b9ac21 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -374,7 +374,18 @@
      */
     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;