Merge \"Always return valid ClipDescription for ACTION_DRAG_EXITED\" into nyc-mr1-dev (b604ade4) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -5502,13 +5502,6 @@ public final class ViewRootImpl implements ViewParent,
		if (mView != null && mAdded) {
		final int what = event.mAction;

		if (what == DragEvent.ACTION_DRAG_EXITED) {
		// A direct EXITED event means that the window manager knows we've just crossed
		// a window boundary, so the current drag target within this one must have
		// just been exited. Send it the usual notifications and then we're done
		// for now.
		mView.dispatchDragEvent(event);
		} else {
		// Cache the drag description when the operation starts, then fill it in
		// on subsequent calls as a convenience
		if (what == DragEvent.ACTION_DRAG_STARTED) {
		@@ -5518,6 +5511,13 @@ public final class ViewRootImpl implements ViewParent,
		event.mClipDescription = mDragDescription;
		}

		if (what == DragEvent.ACTION_DRAG_EXITED) {
		// A direct EXITED event means that the window manager knows we've just crossed
		// a window boundary, so the current drag target within this one must have
		// just been exited. Send it the usual notifications and then we're done
		// for now.
		mView.dispatchDragEvent(event);
		} else {
		// For events with a [screen] location, translate into window coordinates
		if ((what == DragEvent.ACTION_DRAG_LOCATION) \|\| (what == DragEvent.ACTION_DROP)) {
		mDragPoint.set(event.mX, event.mY);