commit a0e2f7f2d56706034bd027a249ead05677c2b6f7
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 14 17:13:01 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 14 17:13:01 2018 +0000
tree 493e1163260ac52458a8539ce42c39ddf2509aa1
parent dd5cc877aea1057332ca332165a9825ee37afacf
parent 7dd3b521ff94be7f060288571b4b87f4126d59d0

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

Change-Id: I07ffa758d6b2357fd7df98a464a7b821a265cc2e

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);
         }