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/android/view | |
| 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/android/view')
| -rw-r--r-- | core/java/android/view/IWindow.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/view/IWindowSession.aidl | 4 | ||||
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/view/IWindow.aidl b/core/java/android/view/IWindow.aidl index 6bfc8b5..71302cb 100644 --- a/core/java/android/view/IWindow.aidl +++ b/core/java/android/view/IWindow.aidl @@ -62,7 +62,7 @@ oneway interface IWindow { /** * Called for wallpaper windows when their offsets change. */ - void dispatchWallpaperOffsets(float x, float y, boolean sync); + void dispatchWallpaperOffsets(float x, float y, float xStep, float yStep, boolean sync); void dispatchWallpaperCommand(String action, int x, int y, int z, in Bundle extras, boolean sync); diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 7e7a38f..b6b009b 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -113,8 +113,10 @@ interface IWindowSession { /** * For windows with the wallpaper behind them, and the wallpaper is * larger than the screen, set the offset within the screen. + * For multi screen launcher type applications, xstep and ystep indicate + * how big the increment is from one screen to another. */ - void setWallpaperPosition(IBinder windowToken, float x, float y); + void setWallpaperPosition(IBinder windowToken, float x, float y, float xstep, float ystep); void wallpaperOffsetsComplete(IBinder window); diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index e4f2b63..ed2139d 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -2896,7 +2896,8 @@ public final class ViewRoot extends Handler implements ViewParent, } } - 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 { sWindowSession.wallpaperOffsetsComplete(asBinder()); |