Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev

am: c8df6aa

* commit 'c8df6aa42facbe0cf7c05e4db78ec4a4e224b78b':
  Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window

Change-Id: I001979d4151a8e2b9e71c471a8aa51c0165d3b40
This commit is contained in:
Vladislav Kaznacheev
2016-04-20 17:16:11 +00:00
committed by android-build-merger

View File

@@ -420,12 +420,7 @@ class DragState {
void notifyLocationLw(float x, float y) {
// Tell the affected window
WindowState touchedWin = mDisplayContent.getTouchableWinAtPointLocked(x, y);
if (touchedWin == null) {
if (DEBUG_DRAG) Slog.d(TAG_WM, "No touched win at x=" + x + " y=" + y);
return;
}
if (!isWindowNotified(touchedWin)) {
if (touchedWin != null && !isWindowNotified(touchedWin)) {
// The drag point is over a window which was not notified about a drag start.
// Pretend it's over empty space.
touchedWin = null;