commit df89cd1b39bcebdd37b29185c76aa005863e8c2f
author Jorim Jaggi <jjaggi@google.com> Mon Apr 25 20:59:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 25 20:59:40 2016 +0000
tree be5f391be1aa16c007df7ec6cd229a46f5749952
parent 0751a83a99dc4481533ed706a942b8bb9caf8834
parent f300badbf10505fbcb884aebb0f2c3120e018748

Merge "Fix bug with cancelled drag" into nyc-dev

packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java

diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
index 2ec180d..0e5ebc9 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
@@ -257,8 +257,12 @@
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL: {
                 if (mDragRequested) {
+                    boolean cancelled = action == MotionEvent.ACTION_CANCEL;
+                    if (cancelled) {
+                        EventBus.getDefault().send(new DragDropTargetChangedEvent(mDragTask, null));
+                    }
                     EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView,
-                            action == MotionEvent.ACTION_UP ? mLastDropTarget : null));
+                            !cancelled ? mLastDropTarget : null));
                     break;
                 }
             }