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

Commit f76f9cdd authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "WindowState: Correct wallpaper scaling" into sc-dev am: e7fc7576 am: cdf8b3c0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15006781

Change-Id: I17f16c2e2e98e6e6494df63e1122f781e44b78f8
parents 38f00290 cdf8b3c0

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

+13 −1
Original line number Diff line number Diff line
@@ -5547,7 +5547,19 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        mSurfacePlacementNeeded = false;

        transformFrameToSurfacePosition(mWindowFrames.mFrame.left, mWindowFrames.mFrame.top,

                mSurfacePosition);



        if (mWallpaperScale != 1f) {

            DisplayInfo displayInfo = getDisplayInfo();

            Matrix matrix = mTmpMatrix;

            matrix.setTranslate(mXOffset, mYOffset);

            matrix.postScale(mWallpaperScale, mWallpaperScale, displayInfo.logicalWidth / 2f,

                displayInfo.logicalHeight / 2f);

            matrix.getValues(mTmpMatrixArray);

            mSurfacePosition.offset(Math.round(mTmpMatrixArray[Matrix.MTRANS_X]),

                Math.round(mTmpMatrixArray[Matrix.MTRANS_Y]));

        } else {

            mSurfacePosition.offset(mXOffset, mYOffset);

        }



        // Freeze position while we're unrotated, so the surface remains at the position it was

        // prior to the rotation.