commit cc721fcffab2fbd1aedc678bf3f00ad20821d5c3
author Winson Chung <winsonc@google.com> Mon May 14 22:49:57 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 14 22:49:57 2018 +0000
tree 11ee6ad07e4d63bcbdd17a30a8c50cea9cdfc5fb
parent 4767f66cb8752bf1099f7ee163f243a34ffefc8a
parent a0e2f7f2d56706034bd027a249ead05677c2b6f7

Merge changes from topic "am-9c233739-95e1-4bd7-8c26-6018062f8dc7" into ub-launcher3-master

* changes:
  [automerger] Clear ref to animation after drag & drop animation completes am: 7dd3b521ff
  Clear ref to animation after drag & drop animation completes

src/com/android/launcher3/dragndrop/DragLayer.java

diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index 3a1837d..7fef904 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -479,6 +480,7 @@
                 case ANIMATION_END_REMAIN_VISIBLE:
                     break;
                 }
+                mDropAnim = null;
             }
         });
         mDropAnim.start();
@@ -488,6 +490,7 @@
         if (mDropAnim != null) {
             mDropAnim.cancel();
         }
+        mDropAnim = null;
         if (mDropView != null) {
             mDragController.onDeferredEndDrag(mDropView);
         }