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

Commit 117197fc authored by Dan Willemsen's avatar Dan Willemsen
Browse files

resolve merge conflicts of 74bc31fe to master 

Change-Id: Ib922ebfb3d91a9c837181a3c652f079cec127f3e
parents c5081a89 74bc31fe

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

+4 −1
Original line number Diff line number Diff line
@@ -246,7 +246,10 @@ class WallpaperController { 


    boolean updateWallpaperOffset(WindowState wallpaperWin, int dw, int dh, boolean sync) {

        boolean rawChanged = false;

        float wpx = mLastWallpaperX >= 0 ? mLastWallpaperX : 0.5f;

        // Set the default wallpaper x-offset to either edge of the screen (depending on RTL), to

        // match the behavior of most Launchers

        float defaultWallpaperX = wallpaperWin.isRtl() ? 1f : 0f;

        float wpx = mLastWallpaperX >= 0 ? mLastWallpaperX : defaultWallpaperX;

        float wpxs = mLastWallpaperXStep >= 0 ? mLastWallpaperXStep : -1.0f;

        int availw = wallpaperWin.mFrame.right - wallpaperWin.mFrame.left - dw;

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

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

+4 −0
Original line number Diff line number Diff line
@@ -3205,4 +3205,8 @@ class WindowState extends WindowContainer implements WindowManagerPolicy.WindowS 
        mAnimatingExit = false;

        mService.mWallpaperControllerLocked.hideWallpapers(this);

    }



    public boolean isRtl() {

        return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;

    }

}