summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2009-11-09 19:34:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 19:34:42 -0800
commit949ffa3da5231772425c3bde50caeab6c4d08ec5 (patch)
tree0103825d81289ff80a2a71267a227a0b4bb291ab /api
parent29b1e0b173a1ed33c5d2ca6c2ee15b4bd4974085 (diff)
parent11cff8cd30f03b5adb137e985532543da5e960c4 (diff)
downloadframeworks_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 'api')
-rw-r--r--api/6.xml19
-rw-r--r--api/current.xml19
2 files changed, 38 insertions, 0 deletions
diff --git a/api/6.xml b/api/6.xml
index eaad28a..32d0f1e 100644
--- a/api/6.xml
+++ b/api/6.xml
@@ -25097,6 +25097,21 @@
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
+<method name="setWallpaperOffsetSteps"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="xStep" type="float">
+</parameter>
+<parameter name="yStep" type="float">
+</parameter>
+</method>
<method name="setWallpaperOffsets"
return="void"
abstract="false"
@@ -123675,6 +123690,10 @@
</parameter>
<parameter name="yOffset" type="float">
</parameter>
+<parameter name="xOffsetStep" type="float">
+</parameter>
+<parameter name="yOffsetStep" type="float">
+</parameter>
<parameter name="xPixelOffset" type="int">
</parameter>
<parameter name="yPixelOffset" type="int">
diff --git a/api/current.xml b/api/current.xml
index a109ef5..7c1497f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -25108,6 +25108,21 @@
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
+<method name="setWallpaperOffsetSteps"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="xStep" type="float">
+</parameter>
+<parameter name="yStep" type="float">
+</parameter>
+</method>
<method name="setWallpaperOffsets"
return="void"
abstract="false"
@@ -123762,6 +123777,10 @@
</parameter>
<parameter name="yOffset" type="float">
</parameter>
+<parameter name="xOffsetStep" type="float">
+</parameter>
+<parameter name="yOffsetStep" type="float">
+</parameter>
<parameter name="xPixelOffset" type="int">
</parameter>
<parameter name="yPixelOffset" type="int">