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

Commit d61752d7 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix drag and drop regression. Bug: 5032496"

parents 13589b2f ea426551

services/java/com/android/server/wm/DragState.java

+34 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ class DragState { 
    float mCurrentX, mCurrentY;

    float mThumbOffsetX, mThumbOffsetY;

    InputChannel mServerChannel, mClientChannel;

    InputApplicationHandle mDragApplicationHandle;

    InputWindowHandle mDragWindowHandle;

    WindowState mTargetWindow;

    ArrayList<WindowState> mNotifiedWindows;

    boolean mDragInProgress;
@@ -91,6 +93,38 @@ class DragState { 
            mService.mInputManager.registerInputChannel(mServerChannel, null);

            InputQueue.registerInputChannel(mClientChannel, mService.mDragInputHandler,

                    mService.mH.getLooper().getQueue());



            mDragApplicationHandle = new InputApplicationHandle(null);

            mDragApplicationHandle.name = "drag";

            mDragApplicationHandle.dispatchingTimeoutNanos =

                    WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;



            mDragWindowHandle = new InputWindowHandle(mDragApplicationHandle, null);

            mDragWindowHandle.name = "drag";

            mDragWindowHandle.inputChannel = mServerChannel;

            mDragWindowHandle.layer = getDragLayerLw();

            mDragWindowHandle.layoutParamsFlags = 0;

            mDragWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_DRAG;

            mDragWindowHandle.dispatchingTimeoutNanos =

                    WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;

            mDragWindowHandle.visible = true;

            mDragWindowHandle.canReceiveKeys = false;

            mDragWindowHandle.hasFocus = true;

            mDragWindowHandle.hasWallpaper = false;

            mDragWindowHandle.paused = false;

            mDragWindowHandle.ownerPid = Process.myPid();

            mDragWindowHandle.ownerUid = Process.myUid();

            mDragWindowHandle.inputFeatures = 0;

            mDragWindowHandle.scaleFactor = 1.0f;



            // The drag window cannot receive new touches.

            mDragWindowHandle.touchableRegion.setEmpty();



            // The drag window covers the entire display

            mDragWindowHandle.frameLeft = 0;

            mDragWindowHandle.frameTop = 0;

            mDragWindowHandle.frameRight = mService.mDisplay.getRealWidth();

            mDragWindowHandle.frameBottom = mService.mDisplay.getRealHeight();

        }

    }

services/java/com/android/server/wm/InputMonitor.java

+2 −44
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ final class InputMonitor { 
    // When true, need to call updateInputWindowsLw().

    private boolean mUpdateInputWindowsNeeded = true;



    // Fake handles for the drag surface, lazily initialized.

    private InputApplicationHandle mDragApplicationHandle;

    private InputWindowHandle mDragWindowHandle;



    // Array of window handles to provide to the input dispatcher.

    private InputWindowHandle[] mInputWindowHandles;

    private int mInputWindowHandleCount;
@@ -121,44 +117,6 @@ final class InputMonitor { 
        return 0; // abort dispatching

    }



    private void addDragInputWindowLw() {

        if (mDragWindowHandle == null) {

            mDragApplicationHandle = new InputApplicationHandle(null);

            mDragApplicationHandle.name = "drag";

            mDragApplicationHandle.dispatchingTimeoutNanos =

                    WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;



            mDragWindowHandle = new InputWindowHandle(mDragApplicationHandle, null);

            mDragWindowHandle.name = "drag";

            mDragWindowHandle.layoutParamsFlags = 0;

            mDragWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_DRAG;

            mDragWindowHandle.dispatchingTimeoutNanos =

                    WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;

            mDragWindowHandle.visible = true;

            mDragWindowHandle.canReceiveKeys = false;

            mDragWindowHandle.hasFocus = true;

            mDragWindowHandle.hasWallpaper = false;

            mDragWindowHandle.paused = false;

            mDragWindowHandle.ownerPid = Process.myPid();

            mDragWindowHandle.ownerUid = Process.myUid();

            mDragWindowHandle.inputFeatures = 0;

            mDragWindowHandle.scaleFactor = 1.0f;



            // The drag window cannot receive new touches.

            mDragWindowHandle.touchableRegion.setEmpty();

        }



        mDragWindowHandle.layer = mService.mDragState.getDragLayerLw();



        // The drag window covers the entire display

        mDragWindowHandle.frameLeft = 0;

        mDragWindowHandle.frameTop = 0;

        mDragWindowHandle.frameRight = mService.mDisplay.getRealWidth();

        mDragWindowHandle.frameBottom = mService.mDisplay.getRealHeight();



        addInputWindowHandleLw(mDragWindowHandle);

    }



    private void addInputWindowHandleLw(InputWindowHandle windowHandle) {

        if (mInputWindowHandles == null) {

            mInputWindowHandles = new InputWindowHandle[16];
@@ -202,7 +160,7 @@ final class InputMonitor { 
            if (WindowManagerService.DEBUG_DRAG) {

                Log.d(WindowManagerService.TAG, "Inserting drag window");

            }

            addDragInputWindowLw();

            addInputWindowHandleLw(mService.mDragState.mDragWindowHandle);

        }



        final int N = windows.size();