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

Commit 35ae828f authored by Arthur Hung's avatar Arthur Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix translateToWindow to report proper values"

parents 185362f4 ef49b9f1

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

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ class DragState { 
                SurfaceControl dragSurface = null;

                if (!mDragResult && (ws.mSession.mPid == mPid)) {

                    // Report unconsumed drop location back to the app that started the drag.

                    x = mCurrentX;

                    y = mCurrentY;

                    x = ws.translateToWindowX(mCurrentX);

                    y = ws.translateToWindowY(mCurrentY);

                    if (relinquishDragSurfaceToDragSource()) {

                        // If requested (and allowed), report the drag surface back to the app

                        // starting the drag to handle the return animation

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

+2 −2
Original line number Diff line number Diff line
@@ -4568,7 +4568,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    float translateToWindowX(float x) {

        float winX = x - mWindowFrames.mFrame.left;

        if (mGlobalScale != 1f) {

            winX *= mGlobalScale;

            winX *= mInvGlobalScale;

        }

        return winX;

    }
@@ -4576,7 +4576,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    float translateToWindowY(float y) {

        float winY = y - mWindowFrames.mFrame.top;

        if (mGlobalScale != 1f) {

            winY *= mGlobalScale;

            winY *= mInvGlobalScale;

        }

        return winY;

    }