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

Commit 3eebf4a8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Merge "Fix clipRect transform rounding errors" into nyc-dev am:... 

Merge "Merge "Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d6 am: 0c633557" into nyc-mr1-dev-plus-aosp am: 4321845b"
parents 69a4db87 e7dcad0a

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

+5 −5
Original line number Diff line number Diff line
@@ -2732,14 +2732,14 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return mStringNameCache;

    }



    void transformFromScreenToSurfaceSpace(Rect rect) {

    void transformClipRectFromScreenToSurfaceSpace(Rect clipRect) {

         if (mHScale >= 0) {

            rect.left = (int) (rect.left / mHScale);

            rect.right = (int) (rect.right / mHScale);

            clipRect.left = (int) (clipRect.left / mHScale);

            clipRect.right = (int) Math.ceil(clipRect.right / mHScale);

        }

        if (mVScale >= 0) {

            rect.top = (int) (rect.top / mVScale);

            rect.bottom = (int) (rect.bottom / mVScale);

            clipRect.top = (int) (clipRect.top / mVScale);

            clipRect.bottom = (int) Math.ceil(clipRect.bottom / mVScale);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ class WindowStateAnimator { 
        if (DEBUG_WINDOW_CROP) Slog.d(TAG,

                "win=" + w + " Clip rect after stack adjustment=" + clipRect);



        w.transformFromScreenToSurfaceSpace(clipRect);

        w.transformClipRectFromScreenToSurfaceSpace(clipRect);



        // See {@link WindowState#notifyMovedInStack} for why this is necessary.

        if (w.hasJustMovedInStack() && mLastClipRect.isEmpty() && !clipRect.isEmpty()) {