diff options
| author | Tony Wickham <twickham@google.com> | 2016-10-27 21:05:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-27 21:05:52 +0000 |
| commit | 968c283f22201c27249fa1ce4c39e49876475519 (patch) | |
| tree | 8462eb975214cd0dc7ec50a0904722108cfb8853 /src/com/android/launcher3/Workspace.java | |
| parent | 3ef8691f8294ad35f792a1b264ac5cfb6eb58cc2 (diff) | |
| parent | 4feb27e6b1b548be7ed8abd7d76fd4d8d5dcfa6e (diff) | |
| download | android_packages_apps_Trebuchet-968c283f22201c27249fa1ce4c39e49876475519.tar.gz android_packages_apps_Trebuchet-968c283f22201c27249fa1ce4c39e49876475519.tar.bz2 android_packages_apps_Trebuchet-968c283f22201c27249fa1ce4c39e49876475519.zip | |
Merge "Restore mDragInfo when deferring onDropComplete() for uninstall." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 3b9d6908d..2161e3970 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3597,8 +3597,10 @@ public class Workspace extends PagedView public void onDropCompleted(final View target, final DragObject d, final boolean isFlingToDelete, final boolean success) { if (mDeferDropAfterUninstall) { + final CellLayout.CellInfo dragInfo = mDragInfo; mDeferredAction = new Runnable() { public void run() { + mDragInfo = dragInfo; // Restore the drag info that was cleared in onDragEnd() onDropCompleted(target, d, isFlingToDelete, success); mDeferredAction = null; } @@ -3626,6 +3628,7 @@ public class Workspace extends PagedView && mDragInfo.cell != null) { mDragInfo.cell.setVisibility(VISIBLE); } + mDragInfo = null; if (!isFlingToDelete) { // Fling to delete already exits spring loaded mode after the animation finishes. |