diff options
| author | Winson Chung <winsonc@google.com> | 2018-05-14 22:49:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-14 22:49:57 +0000 |
| commit | a92961a6391f32f92396949cc8a9268930c48894 (patch) | |
| tree | bb672c4a625013a57692e4bc37fd3f9f95e42422 /src | |
| parent | b299f3f172140756f82f3cb5a5b2ee967b189ff9 (diff) | |
| parent | 7dd3b521ff94be7f060288571b4b87f4126d59d0 (diff) | |
| download | android_packages_apps_Trebuchet-a92961a6391f32f92396949cc8a9268930c48894.tar.gz android_packages_apps_Trebuchet-a92961a6391f32f92396949cc8a9268930c48894.tar.bz2 android_packages_apps_Trebuchet-a92961a6391f32f92396949cc8a9268930c48894.zip | |
Merge "Clear ref to animation after drag & drop animation completes" into ub-launcher3-edmonton
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 3a1837d31..7fef904c2 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 @@ public class DragLayer extends BaseDragLayer<Launcher> { case ANIMATION_END_REMAIN_VISIBLE: break; } + mDropAnim = null; } }); mDropAnim.start(); @@ -488,6 +490,7 @@ public class DragLayer extends BaseDragLayer<Launcher> { if (mDropAnim != null) { mDropAnim.cancel(); } + mDropAnim = null; if (mDropView != null) { mDragController.onDeferredEndDrag(mDropView); } |