Merge "Fix issue where static wallpaper was offset on boot" into jb-dev (ede4d56e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -281,9 +281,16 @@ public class ImageWallpaper extends WallpaperService {
		return;
		}

		if (mBackgroundWidth < 0 \|\| mBackgroundHeight < 0) {
		// If we don't yet know the size of the wallpaper bitmap,
		// we need to get it now.
		boolean updateWallpaper = mBackgroundWidth < 0 \|\| mBackgroundHeight < 0 ;

		// If we somehow got to this point after we have last flushed
		// the wallpaper, well we really need it to draw again. So
		// seems like we need to reload it. Ouch.
		updateWallpaper = updateWallpaper \|\| mBackground == null;

		if (updateWallpaper) {
		updateWallpaperLocked();
		}

		@@ -308,12 +315,6 @@ public class ImageWallpaper extends WallpaperService {
		mLastXTranslation = xPixels;
		mLastYTranslation = yPixels;

		if (mBackground == null) {
		// If we somehow got to this point after we have last flushed
		// the wallpaper, well we really need it to draw again. So
		// seems like we need to reload it. Ouch.
		updateWallpaperLocked();
		}

		if (mIsHwAccelerated) {
		if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) {