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

Commit 4481b457 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Use parent frame to calculate wallpaper offset" into sc-dev am: 15be8ff4 

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

Change-Id: I4e443515bc29a0f8336d5c5afa913a9843f6fc2a
parents 9ef1d61d 15be8ff4

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

+3 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.os.SystemClock; 
import android.util.ArraySet;

import android.util.MathUtils;

import android.util.Slog;

import android.view.DisplayInfo;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.animation.Animation;
@@ -296,9 +295,9 @@ class WallpaperController { 
    }



    boolean updateWallpaperOffset(WindowState wallpaperWin, boolean sync) {

        final DisplayInfo displayInfo = wallpaperWin.getDisplayInfo();

        final int dw = displayInfo.logicalWidth;

        final int dh = displayInfo.logicalHeight;

        final Rect parentFrame = wallpaperWin.getParentFrame();

        final int dw = parentFrame.width();

        final int dh = parentFrame.height();



        int xOffset = 0;

        int yOffset = 0;