Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Defaulting wallpaper offset to edge of the screen.

Browse Source 
am: 4b4ba90d66

Change-Id: I5b851e685637f564ec32dbef9e1437407cf3ea7f
This commit is contained in:
Winson
2016-07-29 05:54:33 +00:00
committed by android-build-merger
parent c3ae3d1eb2 4b4ba90d66
commit 18faeaa5fa
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WallpaperController.java
View File

@@ -246,7 +246,10 @@ class WallpaperController {
boolean updateWallpaperOffset(WindowState wallpaperWin, int dw, int dh, boolean sync) { boolean updateWallpaperOffset(WindowState wallpaperWin, int dw, int dh, boolean sync) {
boolean rawChanged = false; 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; float wpxs = mLastWallpaperXStep >= 0 ? mLastWallpaperXStep : -1.0f;
int availw = wallpaperWin.mFrame.right - wallpaperWin.mFrame.left - dw; int availw = wallpaperWin.mFrame.right - wallpaperWin.mFrame.left - dw;
int offset = availw > 0 ? -(int)(availw * wpx + .5f) : 0; int offset = availw > 0 ? -(int)(availw * wpx + .5f) : 0;

4
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2939,4 +2939,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return -1; return -1;
} }
} }
public boolean isRtl() {
return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
}
} }