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

Merge change 22290 into eclair

Browse Source 
* changes:
  Fix typo: the x offset was assigned to the y coordinate.
This commit is contained in:
Android (Google) Code Review
2009-08-21 13:36:30 -07:00
parent 51afbd308d 07ef599b9f
commit cc0a17cb08
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import android.graphics.Canvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.service.wallpaper.WallpaperService; import android.service.wallpaper.WallpaperService;
import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.content.Context; import android.content.Context;
@@ -87,14 +86,13 @@ public class ImageWallpaper extends WallpaperService {
@Override @Override
public void onTouchEvent(MotionEvent event) { public void onTouchEvent(MotionEvent event) {
super.onTouchEvent(event); super.onTouchEvent(event);
Log.i("foo", "Touch event: " + event);
} }
@Override @Override
public void onOffsetsChanged(float xOffset, float yOffset, public void onOffsetsChanged(float xOffset, float yOffset,
int xPixels, int yPixels) { int xPixels, int yPixels) {
mXOffset = xOffset; mXOffset = xOffset;
mYOffset = xOffset; mYOffset = yOffset;
drawFrame(); drawFrame();
} }
@@ -128,9 +126,9 @@ public class ImageWallpaper extends WallpaperService {
final int availw = bw-dw; final int availw = bw-dw;
final int availh = bh-dh; final int availh = bh-dh;
int xPixels = availw > 0 int xPixels = availw > 0
? -(int)(availw*mXOffset+.5f) : -(int)(availw/2); ? -(int)(availw*mXOffset+.5f) : -(availw/2);
int yPixels = availh > 0 int yPixels = availh > 0
? -(int)(availh*mYOffset+.5f) : -(int)(availh/2); ? -(int)(availh*mYOffset+.5f) : -(availh/2);
c.translate(xPixels, yPixels); c.translate(xPixels, yPixels);
c.drawColor(0xff000000); c.drawColor(0xff000000);
background.draw(c); background.draw(c);