summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorFilip Gruszczynski <gruszczy@google.com>2015-02-06 00:16:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-06 00:16:41 +0000
commitfe7712e758c12e3fbe26c652dc4ca33267210bd0 (patch)
treee4c8ff1685b47f3d72ed89b369dc0b183701847c /api
parent3f579c71674784aebb673d4c82abe63e86883546 (diff)
parent96f3462958977a29aeb8acf102dd5e86c4a5417a (diff)
downloadframeworks_base-fe7712e758c12e3fbe26c652dc4ca33267210bd0.zip
frameworks_base-fe7712e758c12e3fbe26c652dc4ca33267210bd0.tar.gz
frameworks_base-fe7712e758c12e3fbe26c652dc4ca33267210bd0.tar.bz2
am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
automerge: 96f3462 * commit '96f3462958977a29aeb8acf102dd5e86c4a5417a': Add wallpaper controlling system apis.
Diffstat (limited to 'api')
-rw-r--r--api/system-current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 0abb2f9..15eca58 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5371,6 +5371,7 @@ package android.app {
public class WallpaperManager {
method public void clear() throws java.io.IOException;
+ method public void clearWallpaper();
method public void clearWallpaperOffsets(android.os.IBinder);
method public void forgetLoadedWallpaper();
method public android.graphics.drawable.Drawable getBuiltInDrawable();
@@ -5391,6 +5392,7 @@ package android.app {
method public void setDisplayPadding(android.graphics.Rect);
method public void setResource(int) throws java.io.IOException;
method public void setStream(java.io.InputStream) throws java.io.IOException;
+ method public boolean setWallpaperComponent(android.content.ComponentName);
method public void setWallpaperOffsetSteps(float, float);
method public void setWallpaperOffsets(android.os.IBinder, float, float);
method public void suggestDesiredDimensions(int, int);