diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-02-22 17:52:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-22 17:52:59 +0000 |
commit | 8d363f83371b18bef02ad7aeeacc5060f3097c96 (patch) | |
tree | 47ab541fb79be2a5f4059d1c9323d328333de155 | |
parent | a5fadcfd9faca04fed5c41669fe3895d1ac9c283 (diff) | |
parent | 3a34e9e173535888edd154fe76f74ffd82a3d93b (diff) | |
download | android_packages_apps_Snap-8d363f83371b18bef02ad7aeeacc5060f3097c96.tar.gz android_packages_apps_Snap-8d363f83371b18bef02ad7aeeacc5060f3097c96.tar.bz2 android_packages_apps_Snap-8d363f83371b18bef02ad7aeeacc5060f3097c96.zip |
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
-rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 8da8113de..7e8a3f582 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -71,6 +71,7 @@ import com.android.gallery3d.filtershow.imageshow.ImageZoom; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.presets.ImagePreset; import com.android.gallery3d.filtershow.provider.SharedImageProvider; +import com.android.gallery3d.filtershow.tools.BitmapTask; import com.android.gallery3d.filtershow.tools.SaveCopyTask; import com.android.gallery3d.filtershow.ui.FilterIconButton; import com.android.gallery3d.filtershow.ui.FramedTextButton; @@ -1089,11 +1090,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mCropExtras.getOutputFormat(), this); } if (mSaveAsWallpaper) { - try { - WallpaperManager.getInstance(this).setBitmap(filtered); - } catch (IOException e) { - Log.w(LOGTAG, "fail to set wall paper", e); - } + setWallpaperInBackground(filtered); } if (mReturnAsExtra) { if (filtered != null) { @@ -1116,6 +1113,28 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, } } + void setWallpaperInBackground(final Bitmap bmap) { + Toast.makeText(this, R.string.setting_wallpaper, Toast.LENGTH_LONG).show(); + BitmapTask.Callbacks<FilterShowActivity> cb = new BitmapTask.Callbacks<FilterShowActivity>() { + @Override + public void onComplete(Bitmap result) {} + + @Override + public void onCancel() {} + + @Override + public Bitmap onExecute(FilterShowActivity param) { + try { + WallpaperManager.getInstance(param).setBitmap(bmap); + } catch (IOException e) { + Log.w(LOGTAG, "fail to set wall paper", e); + } + return null; + } + }; + (new BitmapTask<FilterShowActivity>(cb)).execute(this); + } + public void done() { if (mOutputted) { hideSavingProgress(); |