Merge "Revert "Implement View.cancelDrag"" (87ab07e9) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -36276,7 +36276,6 @@ package android.view {
		method public boolean canResolveTextDirection();
		method public boolean canScrollHorizontally(int);
		method public boolean canScrollVertically(int);
		method public final void cancelDrag();
		method public void cancelLongPress();
		method public final void cancelPendingInputEvents();
		method public boolean checkInputConnectionProxy(android.view.View);

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -38599,7 +38599,6 @@ package android.view {
		method public boolean canResolveTextDirection();
		method public boolean canScrollHorizontally(int);
		method public boolean canScrollVertically(int);
		method public final void cancelDrag();
		method public void cancelLongPress();
		method public final void cancelPendingInputEvents();
		method public boolean checkInputConnectionProxy(android.view.View);

core/java/android/view/IWindowSession.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -185,11 +185,6 @@ interface IWindowSession {
		*/
		void reportDropResult(IWindow window, boolean consumed);

		/**
		* Cancel a drag operation.
		*/
		void cancelDrag(IBinder dragToken);

		/**
		* Tell the OS that we've just dragged into a View that is willing to accept the drop
		*/

core/java/android/view/View.java

+5 −26

Original line number	Diff line number	Diff line
		@@ -19970,11 +19970,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		Surface surface = new Surface();
		try {
		mAttachInfo.mDragToken = mAttachInfo.mSession.prepareDrag(mAttachInfo.mWindow,
		IBinder token = mAttachInfo.mSession.prepareDrag(mAttachInfo.mWindow,
		flags, shadowSize.x, shadowSize.y, surface);
		if (ViewDebug.DEBUG_DRAG) Log.d(VIEW_LOG_TAG, "prepareDrag returned token="
		+ mAttachInfo.mDragToken + " surface=" + surface);
		if (mAttachInfo.mDragToken != null) {
		if (ViewDebug.DEBUG_DRAG) Log.d(VIEW_LOG_TAG, "prepareDrag returned token=" + token
		+ " surface=" + surface);
		if (token != null) {
		Canvas canvas = surface.lockCanvas(null);
		try {
		canvas.drawColor(0, PorterDuff.Mode.CLEAR);
		@@ -19991,7 +19991,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		// repurpose 'shadowSize' for the last touch point
		root.getLastTouchPoint(shadowSize);

		okay = mAttachInfo.mSession.performDrag(mAttachInfo.mWindow, mAttachInfo.mDragToken,
		okay = mAttachInfo.mSession.performDrag(mAttachInfo.mWindow, token,
		shadowSize.x, shadowSize.y,
		shadowTouchPoint.x, shadowTouchPoint.y, data);
		if (ViewDebug.DEBUG_DRAG) Log.d(VIEW_LOG_TAG, "performDrag returned " + okay);
		@@ -20008,22 +20008,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		return okay;
		}

		public final void cancelDrag() {
		if (ViewDebug.DEBUG_DRAG) {
		Log.d(VIEW_LOG_TAG, "cancelDrag");
		}
		if (mAttachInfo.mDragToken != null) {
		try {
		mAttachInfo.mSession.cancelDrag(mAttachInfo.mDragToken);
		} catch (Exception e) {
		Log.e(VIEW_LOG_TAG, "Unable to cancel drag", e);
		}
		mAttachInfo.mDragToken = null;
		} else {
		Log.e(VIEW_LOG_TAG, "No active drag to cancel");
		}
		}

		/**
		* Starts a move from {startX, startY}, the amount of the movement will be the offset
		* between {startX, startY} and the new cursor positon.
		@@ -22302,11 +22286,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		View mViewRequestingLayout;

		/**
		* Used to track the identity of the current drag operation.
		*/
		IBinder mDragToken;

		/**
		* Used to track views that need (at least) a partial relayout at their current size
		* during the next traversal.

core/java/android/view/ViewRootImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5372,10 +5372,10 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		// When the drag operation ends, reset drag-related state
		// When the drag operation ends, release any local state object
		// that may have been in use
		if (what == DragEvent.ACTION_DRAG_ENDED) {
		setLocalDragState(null);
		mAttachInfo.mDragToken = null;
		}
		}
		}