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

Commit f912513f authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "InputConsumer fixes"

parents 188e9140 47ea21d5

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

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ class DragState { 
        t.setLayer(mInputSurface, Integer.MAX_VALUE);



        mTmpClipRect.set(0, 0, mDisplaySize.x, mDisplaySize.y);

        t.setWindowCrop(mSurfaceControl, mTmpClipRect);

        t.setWindowCrop(mInputSurface, mTmpClipRect);

    }



    /**

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

+3 −3
Original line number Diff line number Diff line
@@ -435,10 +435,10 @@ final class InputMonitor { 
                if (mAddPipInputConsumerHandle) {

                    // Update the bounds of the Pip input consumer to match the window bounds.

                    w.getBounds(mTmpRect);

                    // The touchable region is relative to the surface top-left

                    mTmpRect.top = mTmpRect.left = 0;



                    pipInputConsumer.layout(mInputTransaction, mTmpRect);



                    // The touchable region is relative to the surface top-left

                    mTmpRect.offsetTo(0, 0);

                    pipInputConsumer.mWindowHandle.touchableRegion.set(mTmpRect);

                    pipInputConsumer.show(mInputTransaction, w);

                    mAddPipInputConsumerHandle = false;