Refactoring ImageLoader.

- Moves state (history, loadlisteners, bitmaps, etc.)
  from ImageLoader to MasterImage.
- Makes ImageLoader into a utility class.

Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
index 2f1bbb0c7..0458a2221 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
@@ -29,6 +29,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 
 import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation.StrokeData;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
 import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
@@ -127,11 +128,13 @@ public class ImageFilterDraw extends ImageFilter {
         public Brush(int brushID) {
             mBrushID = brushID;
         }
+
         public Bitmap getBrush() {
             if (mBrush == null) {
                 BitmapFactory.Options opt = new BitmapFactory.Options();
                 opt.inPreferredConfig = Bitmap.Config.ALPHA_8;
-                mBrush = MasterImage.getImage().getImageLoader().decodeImage(mBrushID, opt);
+                mBrush = ImageLoader.decodeImage(MasterImage.getImage().getActivity(), mBrushID,
+                        opt);
                 mBrush = mBrush.extractAlpha();
             }
             return mBrush;