summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-09-08 16:43:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-08 16:43:42 -0700
commit9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8 (patch)
treec1578ed2e3f88acbf2a14ed9909c0bbe8c0b1de9
parenta48dc39bd55c5ddcd991e08f791fd18d94a0db12 (diff)
parent62bf4a0283e855e2fb5f40f36909501e5b4a09eb (diff)
downloadframeworks_base-9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8.zip
frameworks_base-9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8.tar.gz
frameworks_base-9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8.tar.bz2
Merge "Force wallpaper surface to 565." into gingerbread
-rw-r--r--core/java/android/service/wallpaper/WallpaperService.java4
-rw-r--r--core/java/com/android/internal/view/BaseSurfaceHolder.java3
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 57a72bf..2b083dc 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 3a04993..1e97cd6 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;