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

Commit 82467e5c authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Use only width to determine largest display when centering the wallpaper 

Instead of comparing the largest side of one display with the largest
of the other (which doesn't always do what we expected), compare just
the width, as the offset is only applied to the x axis anyway.

Bug: 321041432
Flag: N/A
Test: atest WallpaperControllerTests
Change-Id: I2495b28d5f620b9de0d804f05dc331fa45e585fa
parent c006e274

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

+4 −3
Original line number Diff line number Diff line
@@ -279,13 +279,14 @@ class WallpaperController { 
            return null;

        }

        Point largestDisplaySize = new Point();

        float largestWidth = 0;

        List<DisplayInfo> possibleDisplayInfo =

                mService.getPossibleDisplayInfoLocked(DEFAULT_DISPLAY);

        for (int i = 0; i < possibleDisplayInfo.size(); i++) {

            DisplayInfo displayInfo = possibleDisplayInfo.get(i);

            if (displayInfo.type == Display.TYPE_INTERNAL

                    && Math.max(displayInfo.logicalWidth, displayInfo.logicalHeight)

                    > Math.max(largestDisplaySize.x, largestDisplaySize.y)) {

            float width = (float) displayInfo.logicalWidth / displayInfo.physicalXDpi;

            if (displayInfo.type == Display.TYPE_INTERNAL && width > largestWidth) {

                largestWidth = width;

                largestDisplaySize.set(displayInfo.logicalWidth,

                        displayInfo.logicalHeight);

            }