Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."

This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea

Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b

1 files changed, 10 insertions, 9 deletions

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);
     }
 }