Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jorim Jaggi
2016-04-25 20:59:38 +00:00
committed by Android (Google) Code Review
parent 0751a83a99 f300badbf1
commit df89cd1b39
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,8 +257,12 @@ public class RecentsViewTouchHandler {
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: { case MotionEvent.ACTION_CANCEL: {
if (mDragRequested) { if (mDragRequested) {
boolean cancelled = action == MotionEvent.ACTION_CANCEL;
if (cancelled) {
EventBus.getDefault().send(new DragDropTargetChangedEvent(mDragTask, null));
}
EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView, EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView,
action == MotionEvent.ACTION_UP ? mLastDropTarget : null)); !cancelled ? mLastDropTarget : null));
break; break;
} }
} }