commit f0a5e3592ad4c5ddccce020374f271001edbcfa9
author Owen Lin <owenlin@google.com> Thu Jun 03 20:24:51 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 03 20:24:51 2010 -0700
tree 034689f6b2e768e42b4ada4ad432790f76ca865d
parent 3fccd3e4be9142089b58e8470361fcb64e02c6b0
parent 8e92e5d44b19a8ed2f31a973b24339580ba4b4df

Merge "GL_BLEND should enabled not only based on the texture's opaqueness." into kraken

src/com/cooliris/media/Photographs.java

diff --git a/src/com/cooliris/media/Photographs.java b/src/com/cooliris/media/Photographs.java
index 7fea084..e23a96b 100644
--- a/src/com/cooliris/media/Photographs.java
+++ b/src/com/cooliris/media/Photographs.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.app.WallpaperManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -93,7 +94,7 @@
         @Override
         public void run() {
             try {
-                mContext.setWallpaper(mBitmap);
+                WallpaperManager.getInstance(mContext).setBitmap(mBitmap);
             } catch (IOException e) {
                 Log.e(LOG_TAG, "Failed to set wallpaper.", e);
             } finally {

src/com/cooliris/media/Wallpaper.java

diff --git a/src/com/cooliris/media/Wallpaper.java b/src/com/cooliris/media/Wallpaper.java
index 368c1e7..70c1ccc 100644
--- a/src/com/cooliris/media/Wallpaper.java
+++ b/src/com/cooliris/media/Wallpaper.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.app.WallpaperManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -91,7 +92,7 @@
         @Override
         public void run() {
             try {
-                mContext.setWallpaper(mBitmap);
+                WallpaperManager.getInstance(mContext).setBitmap(mBitmap);
             } catch (IOException e) {
                 Log.e(LOG_TAG, "Failed to set wallpaper.", e);
             } finally {