diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-21 13:36:30 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-21 13:36:30 -0700 |
commit | cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9 (patch) | |
tree | 5dbe88d36968505bce70c9bb1f95dc22758a2776 /core/java | |
parent | 51afbd308dff8bd7accf5510e60367107d4c40a1 (diff) | |
parent | 07ef599b9f35572a3a75b884febe500a6c390e7e (diff) | |
download | frameworks_base-cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9.zip frameworks_base-cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9.tar.gz frameworks_base-cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9.tar.bz2 |
Merge change 22290 into eclair
* changes:
Fix typo: the x offset was assigned to the y coordinate.
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/com/android/internal/service/wallpaper/ImageWallpaper.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java b/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java index 3f2979f..c4eb31f 100644 --- a/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java +++ b/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java @@ -21,7 +21,6 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.service.wallpaper.WallpaperService; -import android.util.Log; import android.view.MotionEvent; import android.view.SurfaceHolder; import android.content.Context; @@ -87,14 +86,13 @@ public class ImageWallpaper extends WallpaperService { @Override public void onTouchEvent(MotionEvent event) { super.onTouchEvent(event); - Log.i("foo", "Touch event: " + event); } @Override public void onOffsetsChanged(float xOffset, float yOffset, int xPixels, int yPixels) { mXOffset = xOffset; - mYOffset = xOffset; + mYOffset = yOffset; drawFrame(); } @@ -128,9 +126,9 @@ public class ImageWallpaper extends WallpaperService { final int availw = bw-dw; final int availh = bh-dh; int xPixels = availw > 0 - ? -(int)(availw*mXOffset+.5f) : -(int)(availw/2); + ? -(int)(availw*mXOffset+.5f) : -(availw/2); int yPixels = availh > 0 - ? -(int)(availh*mYOffset+.5f) : -(int)(availh/2); + ? -(int)(availh*mYOffset+.5f) : -(availh/2); c.translate(xPixels, yPixels); c.drawColor(0xff000000); background.draw(c); |