commit d7d15dad7baa03aef5e0c9b000085f5487b49de6
author Vadim Tryshev <vadimt@google.com> Tue Aug 11 18:22:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 11 18:22:51 2015 +0000
tree 7b2427063bce2723772d068ee4aa0c0aaec8c24f
parent 0396828d05a9f25791a4b9324ee5a23b7481b2e2
parent ceed3b87dc5c1229bcd9050392e023f9a58eaa2c

Merge "Framework drag driver now sends new event type - exited window." into ub-launcher3-master

src/com/android/launcher3/DragController.java

diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 2b4f019..1373bf2 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -437,6 +437,14 @@
     }
 
     @Override
+    public void onDriverDragExitWindow() {
+        if (mLastDropTarget != null) {
+            mLastDropTarget.onDragExit(mDragObject);
+            mLastDropTarget = null;
+        }
+    }
+
+    @Override
     public void onDriverDragEnd(float x, float y, DropTarget dropTargetOverride) {
         final int[] dragLayerPos = getClampedDragLayerPos(x, y);
         final int dragLayerX = dragLayerPos[0];

src/com/android/launcher3/DragDriver.java

diff --git a/src/com/android/launcher3/DragDriver.java b/src/com/android/launcher3/DragDriver.java
index 6cd52bd..9ee4b3d 100644
--- a/src/com/android/launcher3/DragDriver.java
+++ b/src/com/android/launcher3/DragDriver.java
@@ -32,6 +32,7 @@
 
     public interface EventListener {
         void onDriverDragMove(float x, float y);
+        void onDriverDragExitWindow();
         void onDriverDragEnd(float x, float y, DropTarget dropTargetOverride);
         void onDriverDragCancel();
     }
@@ -165,6 +166,7 @@
                 return true;
 
             case DragEvent.ACTION_DRAG_EXITED:
+                mEventListener.onDriverDragExitWindow();
                 return true;
 
             case DragEvent.ACTION_DRAG_ENDED: