summaryrefslogtreecommitdiffstats
path: root/core/java/android/service/wallpaper
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-02-01 16:26:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-01 16:26:12 -0800
commit2a70a1e349cb982ae68196195d4745474d8f2568 (patch)
tree59b435e099d91c1c0b79cb73cfded5500ba9c999 /core/java/android/service/wallpaper
parent566cd74f5686b480d2e3d49c4505c45df7712587 (diff)
parentbd77ed7fff87b79008e3b071115674dff2721994 (diff)
downloadframeworks_base-2a70a1e349cb982ae68196195d4745474d8f2568.zip
frameworks_base-2a70a1e349cb982ae68196195d4745474d8f2568.tar.gz
frameworks_base-2a70a1e349cb982ae68196195d4745474d8f2568.tar.bz2
am bd77ed7f: Merge "Make image wallpaper use a big surface." into honeycomb
* commit 'bd77ed7fff87b79008e3b071115674dff2721994': Make image wallpaper use a big surface.
Diffstat (limited to 'core/java/android/service/wallpaper')
-rw-r--r--core/java/android/service/wallpaper/WallpaperService.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 95d985d..1dfc469 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -204,12 +204,6 @@ public abstract class WallpaperService extends Service {
return mIsCreating;
}
- @Override
- public void setFixedSize(int width, int height) {
- throw new UnsupportedOperationException(
- "Wallpapers currently only support sizing from layout");
- }
-
public void setKeepScreenOn(boolean screenOn) {
throw new UnsupportedOperationException(
"Wallpapers do not support keep screen on");