Fix bug with cancelled drag

Bug: 28257206 Change-Id: Ic7342f4284185486e884836220b05423e308f7ae
2016-04-25 13:00:27 -07:00
parent dbe44ac48d
commit f300badbf1
1 changed files with 5 additions and 1 deletions
--- 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 @@ public class RecentsViewTouchHandler {
            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;
                }
            }