diff options
| author | Marco Nelissen <marcone@google.com> | 2009-11-09 19:34:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-09 19:34:42 -0800 |
| commit | 949ffa3da5231772425c3bde50caeab6c4d08ec5 (patch) | |
| tree | 0103825d81289ff80a2a71267a227a0b4bb291ab /core/java/com | |
| parent | 29b1e0b173a1ed33c5d2ca6c2ee15b4bd4974085 (diff) | |
| parent | 11cff8cd30f03b5adb137e985532543da5e960c4 (diff) | |
| download | frameworks_base-949ffa3da5231772425c3bde50caeab6c4d08ec5.zip frameworks_base-949ffa3da5231772425c3bde50caeab6c4d08ec5.tar.gz frameworks_base-949ffa3da5231772425c3bde50caeab6c4d08ec5.tar.bz2 | |
am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/service/wallpaper/ImageWallpaper.java | 1 | ||||
| -rw-r--r-- | core/java/com/android/internal/view/BaseIWindow.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java b/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java index 6d29038..c09ecfb 100644 --- a/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java +++ b/core/java/com/android/internal/service/wallpaper/ImageWallpaper.java @@ -102,6 +102,7 @@ public class ImageWallpaper extends WallpaperService { @Override public void onOffsetsChanged(float xOffset, float yOffset, + float xOffsetStep, float yOffsetStep, int xPixels, int yPixels) { mXOffset = xOffset; mYOffset = yOffset; diff --git a/core/java/com/android/internal/view/BaseIWindow.java b/core/java/com/android/internal/view/BaseIWindow.java index 2674262..15dcbd6 100644 --- a/core/java/com/android/internal/view/BaseIWindow.java +++ b/core/java/com/android/internal/view/BaseIWindow.java @@ -94,7 +94,7 @@ public class BaseIWindow extends IWindow.Stub { public void closeSystemDialogs(String reason) { } - public void dispatchWallpaperOffsets(float x, float y, boolean sync) { + public void dispatchWallpaperOffsets(float x, float y, float xStep, float yStep, boolean sync) { if (sync) { try { mSession.wallpaperOffsetsComplete(asBinder()); |