Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a6d408 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix bug with cancelled drag" into nyc-dev am: df89cd1b 

am: 32480c2e

* commit '32480c2e':
  Fix bug with cancelled drag

Change-Id: I2f52c3604ebfc17944336f6c9ce20d67b38293a4
parents 39045d43 32480c2e

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

+5 −1
Original line number Diff line number Diff line
@@ -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;

                }

            }