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

Commit 22ce4db7 authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Automerger Merge Worker
Browse files

Merge "Always compute zoom in adjustWallpaperWindows" into rvc-dev am: f0c6851a 

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

Change-Id: I329c22f04c9457daddd769e6352e766d00b44fe6
parents 2e7a1c94 f0c6851a

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

+9 −5
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ class WallpaperController { 
    private static final int WALLPAPER_DRAW_TIMEOUT = 2;

    private int mWallpaperDrawState = WALLPAPER_DRAW_NORMAL;



    private boolean mShouldUpdateZoom;



    /**

     * Temporary storage for taking a screenshot of the wallpaper.

     * @see #screenshotWallpaperLocked()
@@ -400,6 +402,7 @@ class WallpaperController { 
    void setWallpaperZoomOut(WindowState window, float zoom) {

        if (Float.compare(window.mWallpaperZoomOut, zoom) != 0) {

            window.mWallpaperZoomOut = zoom;

            mShouldUpdateZoom = true;

            updateWallpaperOffsetLocked(window, false);

        }

    }
@@ -623,9 +626,7 @@ class WallpaperController { 
                mLastWallpaperX = mWallpaperTarget.mWallpaperX;

                mLastWallpaperXStep = mWallpaperTarget.mWallpaperXStep;

            }

            if (mWallpaperTarget.mWallpaperZoomOut >= 0) {

                mLastWallpaperZoomOut = mWallpaperTarget.mWallpaperZoomOut;

            }

            computeLastWallpaperZoomOut();

            if (mWallpaperTarget.mWallpaperY >= 0) {

                mLastWallpaperY = mWallpaperTarget.mWallpaperY;

                mLastWallpaperYStep = mWallpaperTarget.mWallpaperYStep;
@@ -804,8 +805,11 @@ class WallpaperController { 
     * we'll have conflicts and break the "depth system" mental model.

     */

    private void computeLastWallpaperZoomOut() {

        if (mShouldUpdateZoom) {

            mLastWallpaperZoomOut = 0;

            mDisplayContent.forAllWindows(mComputeMaxZoomOutFunction, true);

            mShouldUpdateZoom = false;

        }

    }



    private float zoomOutToScale(float zoom) {