diff options
Diffstat (limited to 'src/com/android/gallery3d')
3 files changed, 16 insertions, 42 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 9b1e92cd8..1c7c0642a 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -86,7 +86,6 @@ import com.android.gallery3d.filtershow.ui.FilterIconButton; import com.android.gallery3d.filtershow.ui.FramedTextButton; import com.android.gallery3d.filtershow.ui.Spline; import com.android.gallery3d.util.GalleryUtils; -import com.android.photos.data.GalleryBitmapPool; import java.io.File; import java.io.IOException; @@ -142,8 +141,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - clearGalleryBitmapPoolInBackground(); - setupMasterImage(); setDefaultValues(); fillEditors(); @@ -515,24 +512,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, } - void clearGalleryBitmapPoolInBackground() { - BitmapTask.Callbacks<Object, Object> cb = new BitmapTask.Callbacks<Object, Object>() { - @Override - public void onComplete(Object result) {} - - @Override - public void onCancel() {} - - @Override - public Object onExecute(Object param) { - // Free memory held in Gallery's Bitmap pool. May be O(n) for n bitmaps. - GalleryBitmapPool.getInstance().clear(); - return null; - } - }; - (new BitmapTask<Object, Object>(cb)).execute(0); - } - private void fillButtonIcons() { Bitmap bmap = mImageLoader.getOriginalBitmapSmall(); if (bmap != null && bmap.getWidth() > 0 && bmap.getHeight() > 0) { @@ -1146,7 +1125,7 @@ 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, Bitmap> cb = new BitmapTask.Callbacks<FilterShowActivity, Bitmap>() { + BitmapTask.Callbacks<FilterShowActivity> cb = new BitmapTask.Callbacks<FilterShowActivity>() { @Override public void onComplete(Bitmap result) {} @@ -1155,9 +1134,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, @Override public Bitmap onExecute(FilterShowActivity param) { - if (param == null) { - return null; - } try { WallpaperManager.getInstance(param).setBitmap(bmap); } catch (IOException e) { @@ -1166,7 +1142,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, return null; } }; - (new BitmapTask<FilterShowActivity, Bitmap>(cb)).execute(this); + (new BitmapTask<FilterShowActivity>(cb)).execute(this); } public void done() { diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index 08ed40311..6cf462269 100644 --- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java +++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java @@ -520,7 +520,7 @@ public class ImageLoader { preset.setQuality(ImagePreset.QUALITY_FINAL); preset.setScaleFactor(1.0f); - BitmapTask.Callbacks<ImagePreset, Bitmap> cb = new BitmapTask.Callbacks<ImagePreset, Bitmap>() { + BitmapTask.Callbacks<ImagePreset> cb = new BitmapTask.Callbacks<ImagePreset>() { @Override public void onComplete(Bitmap result) { @@ -570,7 +570,7 @@ public class ImageLoader { } }; - (new BitmapTask<ImagePreset, Bitmap>(cb)).execute(preset); + (new BitmapTask<ImagePreset>(cb)).execute(preset); } private String getFileExtension(String requestFormat) { @@ -604,7 +604,7 @@ public class ImageLoader { final InterruptableOutputStream ios = new InterruptableOutputStream(out); - BitmapTask.Callbacks<Bitmap, Bitmap> cb = new BitmapTask.Callbacks<Bitmap, Bitmap>() { + BitmapTask.Callbacks<Bitmap> cb = new BitmapTask.Callbacks<Bitmap>() { @Override public void onComplete(Bitmap result) { @@ -618,9 +618,6 @@ public class ImageLoader { @Override public Bitmap onExecute(Bitmap param) { - if (param == null) { - return null; - } CompressFormat cf = convertExtensionToCompressFormat(getFileExtension(outputFormat)); param.compress(cf, DEFAULT_COMPRESS_QUALITY, ios); Utils.closeSilently(ios); @@ -628,7 +625,7 @@ public class ImageLoader { } }; - (new BitmapTask<Bitmap, Bitmap>(cb)).execute(bmap); + (new BitmapTask<Bitmap>(cb)).execute(bmap); } public void setAdapter(HistoryAdapter adapter) { diff --git a/src/com/android/gallery3d/filtershow/tools/BitmapTask.java b/src/com/android/gallery3d/filtershow/tools/BitmapTask.java index 53864a225..62801c1f2 100644 --- a/src/com/android/gallery3d/filtershow/tools/BitmapTask.java +++ b/src/com/android/gallery3d/filtershow/tools/BitmapTask.java @@ -16,22 +16,23 @@ package com.android.gallery3d.filtershow.tools; +import android.graphics.Bitmap; import android.os.AsyncTask; /** - * Asynchronous task wrapper class for doing Bitmap I/O. + * Asynchronous task filtering or doign I/O with bitmaps. */ -public class BitmapTask <T, K> extends AsyncTask<T, Void, K> { +public class BitmapTask <T> extends AsyncTask<T, Void, Bitmap> { - private Callbacks<T, K> mCallbacks; + private Callbacks<T> mCallbacks; private static final String LOGTAG = "BitmapTask"; - public BitmapTask(Callbacks<T, K> callbacks) { + public BitmapTask(Callbacks<T> callbacks) { mCallbacks = callbacks; } @Override - protected K doInBackground(T... params) { + protected Bitmap doInBackground(T... params) { if (params == null || mCallbacks == null) { return null; } @@ -39,7 +40,7 @@ public class BitmapTask <T, K> extends AsyncTask<T, Void, K> { } @Override - protected void onPostExecute(K result) { + protected void onPostExecute(Bitmap result) { if (mCallbacks == null) { return; } @@ -57,11 +58,11 @@ public class BitmapTask <T, K> extends AsyncTask<T, Void, K> { /** * Callbacks for the asynchronous task. */ - public interface Callbacks<P, J> { - void onComplete(J result); + public interface Callbacks<P> { + void onComplete(Bitmap result); void onCancel(); - J onExecute(P param); + Bitmap onExecute(P param); } } |