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

am 582a3944: Merge "Fix a regression in the wallpaper drawing." into honeycomb

Browse Source 
* commit '582a3944f704d7fde660126ef92cf4736c734ac2':
  Fix a regression in the wallpaper drawing.
This commit is contained in:
Dianne Hackborn
2011-01-23 23:38:05 -08:00
committed by Android Git Automerger
parent caa54b3912 582a3944f7
commit 1eefe1facc
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/java/com/android/internal/service/wallpaper/ImageWallpaper.java
View File

@@ -187,33 +187,36 @@ public class ImageWallpaper extends WallpaperService {
} }
SurfaceHolder sh = getSurfaceHolder(); SurfaceHolder sh = getSurfaceHolder();
final Rect frame = sh.getSurfaceFrame();
final Drawable background = mBackground;
final int dw = frame.width();
final int dh = frame.height();
final int bw = background != null ? background.getIntrinsicWidth() : 0;
final int bh = background != null ? background.getIntrinsicHeight() : 0;
final int availw = dw - bw;
final int availh = dh - bh;
int xPixels = availw < 0 ? (int)(availw * mXOffset + .5f) : (availw / 2);
int yPixels = availh < 0 ? (int)(availh * mYOffset + .5f) : (availh / 2);
mOffsetsChanged = false;
if (!mRedrawNeeded
&& xPixels == mLastXTranslation && yPixels == mLastYTranslation) {
if (DEBUG) {
Log.d(TAG, "Suppressed drawFrame since the image has not "
+ "actually moved an integral number of pixels.");
}
return;
}
mRedrawNeeded = false;
mLastXTranslation = xPixels;
mLastYTranslation = yPixels;
Canvas c = sh.lockCanvas(); Canvas c = sh.lockCanvas();
if (c != null) { if (c != null) {
try { try {
final Rect frame = sh.getSurfaceFrame(); if (DEBUG) {
final Drawable background = mBackground; Log.d(TAG, "Redrawing: xPixels=" + xPixels + ", yPixels=" + yPixels);
final int dw = frame.width();
final int dh = frame.height();
final int bw = background != null ? background.getIntrinsicWidth() : 0;
final int bh = background != null ? background.getIntrinsicHeight() : 0;
final int availw = dw-bw;
final int availh = dh-bh;
int xPixels = availw < 0 ? (int)(availw*mXOffset+.5f) : (availw/2);
int yPixels = availh < 0 ? (int)(availh*mYOffset+.5f) : (availh/2);
mOffsetsChanged = false;
if (!mRedrawNeeded) {
if (xPixels == mLastXTranslation && yPixels == mLastYTranslation) {
if (DEBUG) {
Log.d(TAG, "Suppressed drawFrame since the image has not "
+ "actually moved an integral number of pixels.");
}
return;
}
} }
mRedrawNeeded = false;
mLastXTranslation = xPixels;
mLastYTranslation = yPixels;
c.translate(xPixels, yPixels); c.translate(xPixels, yPixels);
if (availw < 0 || availh < 0) { if (availw < 0 || availh < 0) {