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

Merge "Fix issue where static wallpaper was offset on boot" into jb-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-05-17 16:01:35 -07:00
committed by Android (Google) Code Review
parent cb949887d0 321357b606
commit ede4d56ec7
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
View File

@@ -281,9 +281,16 @@ public class ImageWallpaper extends WallpaperService {
return; return;
} }
if (mBackgroundWidth < 0 || mBackgroundHeight < 0) {
// If we don't yet know the size of the wallpaper bitmap, // If we don't yet know the size of the wallpaper bitmap,
// we need to get it now. // 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(); updateWallpaperLocked();
} }
@@ -308,12 +315,6 @@ public class ImageWallpaper extends WallpaperService {
mLastXTranslation = xPixels; mLastXTranslation = xPixels;
mLastYTranslation = yPixels; 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 (mIsHwAccelerated) {
if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) { if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) {