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

Commit 9d1869e0 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid applying weird wallpaper offset" into udc-dev am: 48f4fbfa 

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



Change-Id: I334ea81fb926c483469c37d79ffcadccc3ad1bfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb6df2da 48f4fbfa

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

+15 −4
Original line number Diff line number Diff line
@@ -401,6 +401,19 @@ class WallpaperController { 
        // swiping through Launcher pages).

        final Rect wallpaperFrame = wallpaperWin.getFrame();



        final int diffWidth = wallpaperFrame.width() - lastWallpaperBounds.width();

        final int diffHeight = wallpaperFrame.height() - lastWallpaperBounds.height();

        if ((wallpaperWin.mAttrs.flags & WindowManager.LayoutParams.FLAG_SCALED) != 0

                && Math.abs(diffWidth) > 1 && Math.abs(diffHeight) > 1) {

            Slog.d(TAG, "Skip wallpaper offset with inconsistent orientation, bounds="

                    + lastWallpaperBounds + " frame=" + wallpaperFrame);

            // With FLAG_SCALED, the requested size should at least make the frame match one of

            // side. If both sides contain differences, the client side may not have updated the

            // latest size according to the current orientation. So skip calculating the offset to

            // avoid the wallpaper not filling the screen.

            return false;

        }



        int newXOffset = 0;

        int newYOffset = 0;

        boolean rawChanged = false;
@@ -417,7 +430,7 @@ class WallpaperController { 
        float wpxs = mLastWallpaperXStep >= 0 ? mLastWallpaperXStep : -1.0f;

        // Difference between width of wallpaper image, and the last size of the wallpaper.

        // This is the horizontal surplus from the prior configuration.

        int availw = wallpaperFrame.width() - lastWallpaperBounds.width();

        int availw = diffWidth;



        int displayOffset = getDisplayWidthOffset(availw, lastWallpaperBounds,

                wallpaperWin.isRtl());
@@ -442,9 +455,7 @@ class WallpaperController { 


        float wpy = mLastWallpaperY >= 0 ? mLastWallpaperY : 0.5f;

        float wpys = mLastWallpaperYStep >= 0 ? mLastWallpaperYStep : -1.0f;

        int availh = wallpaperWin.getFrame().bottom - wallpaperWin.getFrame().top

                - lastWallpaperBounds.height();

        offset = availh > 0 ? -(int)(availh * wpy + .5f) : 0;

        offset = diffHeight > 0 ? -(int) (diffHeight * wpy + .5f) : 0;

        if (mLastWallpaperDisplayOffsetY != Integer.MIN_VALUE) {

            offset += mLastWallpaperDisplayOffsetY;

        }