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

Commit 91ed1021 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev am: 315959c6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19904952



Change-Id: Ia70095adb4302755b96fde3bfe8a7f17675f0cc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d513c90 315959c6

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java

+1 −1
Original line number Diff line number Diff line
@@ -258,12 +258,12 @@ public class DragAndDropController implements DisplayController.OnDisplaysChange 
                break;

            case ACTION_DRAG_ENTERED:

                pd.dragLayout.show();

                pd.dragLayout.update(event);

                break;

            case ACTION_DRAG_LOCATION:

                pd.dragLayout.update(event);

                break;

            case ACTION_DROP: {

                pd.dragLayout.update(event);

                return handleDrop(event, pd);

            }

            case ACTION_DRAG_EXITED: {