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

Commit 54d6b95e authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

Revert "Implement View.cancelDrag" 

This reverts commit 93cf731b.

This is required because adding View.cancelDrag conflicts with existing app code.

Change-Id: I323fc5d2144266781d3168fe033c53cb5b37050e
parent 93cf731b

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -36238,7 +36238,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
@@ -38559,7 +38559,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
@@ -19905,11 +19905,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);
@@ -19926,7 +19926,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);









@@ -19943,22 +19943,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.










@@ -22236,11 +22220,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













         */















        View mViewRequestingLayout;



























        /**













         * Used to track the identity of the current drag operation.













         */













        IBinder mDragToken;



























        /**















         * Creates a new set of attachment information with the specified















         * events handler and thread.

























core/java/android/view/ViewRootImpl.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -5307,10 +5307,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;















                }















            }















        }