Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev am: 315959c6b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19904952 Change-Id: Ia70095adb4302755b96fde3bfe8a7f17675f0cc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -258,12 +258,12 @@ public class DragAndDropController implements DisplayController.OnDisplaysChange
|
|||||||
break;
|
break;
|
||||||
case ACTION_DRAG_ENTERED:
|
case ACTION_DRAG_ENTERED:
|
||||||
pd.dragLayout.show();
|
pd.dragLayout.show();
|
||||||
pd.dragLayout.update(event);
|
|
||||||
break;
|
break;
|
||||||
case ACTION_DRAG_LOCATION:
|
case ACTION_DRAG_LOCATION:
|
||||||
pd.dragLayout.update(event);
|
pd.dragLayout.update(event);
|
||||||
break;
|
break;
|
||||||
case ACTION_DROP: {
|
case ACTION_DROP: {
|
||||||
|
pd.dragLayout.update(event);
|
||||||
return handleDrop(event, pd);
|
return handleDrop(event, pd);
|
||||||
}
|
}
|
||||||
case ACTION_DRAG_EXITED: {
|
case ACTION_DRAG_EXITED: {
|
||||||
|
|||||||
Reference in New Issue
Block a user