commit 1797af41d162413dc98c33fab8ba19f96b63874b
author Sunny Goyal <sunnygoyal@google.com> Fri Oct 06 13:29:57 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Oct 16 13:06:52 2017 -0700
tree a9003b1952e98db0ec53dab673e00499e46bb6f7
parent cbdfc598fae13f5aa7f7263351872d160004fbe7

Cleaning up drag state management.

When the drag is started, the UI automatically goes into spring loaded mode. On a successful
drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded
mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode.

Bug: 34692289
Change-Id: Ic611739a43bb8d9279b587aaee3039326c143e8b

src/com/android/launcher3/UninstallDropTarget.java

diff --git a/src/com/android/launcher3/UninstallDropTarget.java b/src/com/android/launcher3/UninstallDropTarget.java
index e8c4528..4393819 100644
--- a/src/com/android/launcher3/UninstallDropTarget.java
+++ b/src/com/android/launcher3/UninstallDropTarget.java
@@ -97,9 +97,7 @@
     @Override
     public void onDrop(DragObject d, DragOptions options) {
         // Defer onComplete
-        if (options.deferCompleteForUninstall) {
-            d.dragSource = new DeferredOnComplete(d.dragSource, getContext());
-        }
+        d.dragSource = new DeferredOnComplete(d.dragSource, getContext());
         super.onDrop(d, options);
     }
 
@@ -171,7 +169,7 @@
         }
 
         @Override
-        public void onDropCompleted(View target, DragObject d, boolean isFlingToDelete,
+        public void onDropCompleted(View target, DragObject d,
                 boolean success) {
             mDragObject = d;
         }
@@ -189,7 +187,7 @@
                     .getApplicationInfo(mPackageName, PackageManager.MATCH_UNINSTALLED_PACKAGES,
                             mDragObject.dragInfo.user) == null) {
                 mDragObject.dragSource = mOriginal;
-                mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, false, true);
+                mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, true);
             } else {
                 sendFailure();
             }
@@ -198,7 +196,7 @@
         public void sendFailure() {
             mDragObject.dragSource = mOriginal;
             mDragObject.cancelled = true;
-            mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, false, false);
+            mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, false);
         }
     }
 }