diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-08 16:46:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 16:46:46 -0700 |
| commit | 3fa7d8af6560de07ef673f73308f7e51de64e4ec (patch) | |
| tree | 6a109f0a4b0f88b6efa7002f79b3c2c542445e3f /core/java | |
| parent | d8f62ec44706153490bf63cddeac7d9c76e9e742 (diff) | |
| parent | 9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8 (diff) | |
am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp
* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
Force wallpaper surface to 565.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 4 | ||||
| -rw-r--r-- | core/java/com/android/internal/view/BaseSurfaceHolder.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 57a72bf75bd9..2b083dca2ca6 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -30,6 +30,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; +import android.graphics.PixelFormat; import android.graphics.Rect; import android.os.Bundle; import android.os.IBinder; @@ -178,6 +179,9 @@ public abstract class WallpaperService extends Service { }; final BaseSurfaceHolder mSurfaceHolder = new BaseSurfaceHolder() { + { + mRequestedFormat = PixelFormat.RGB_565; + } @Override public boolean onAllowLockCanvas() { diff --git a/core/java/com/android/internal/view/BaseSurfaceHolder.java b/core/java/com/android/internal/view/BaseSurfaceHolder.java index 3a0499359f57..1e97cd687f40 100644 --- a/core/java/com/android/internal/view/BaseSurfaceHolder.java +++ b/core/java/com/android/internal/view/BaseSurfaceHolder.java @@ -41,7 +41,8 @@ public abstract class BaseSurfaceHolder implements SurfaceHolder { int mRequestedWidth = -1; int mRequestedHeight = -1; - int mRequestedFormat = PixelFormat.OPAQUE; + /** @hide */ + protected int mRequestedFormat = PixelFormat.OPAQUE; int mRequestedType = -1; long mLastLockTime = 0; |