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

Commit c24a6446 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 

am: 99a6d408

* commit '99a6d408':
  Fix bug with cancelled drag

Change-Id: I94db31990191120d476883f66db290fc22d5eb4d
parents ad35c9d7 99a6d408

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;

                }

            }