From cdb0abb4e1e47c7bb5f278885f337013ed5af3d7 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Fri, 19 Oct 2012 15:32:12 -0700
Subject: Add the infrastructure to support Tiny Planet

bug:7293391
Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
---
 .../gallery3d/filtershow/presets/ImagePreset.java       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 0d8fc317e..83e7c129a 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.util.Log;
 
 import com.android.gallery3d.filtershow.ImageStateAdapter;
+import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
 import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
 import com.android.gallery3d.filtershow.imageshow.ImageShow;
@@ -19,6 +20,7 @@ public class ImagePreset {
     private ImageFilter mImageBorder = null;
     private float mScaleFactor = 1.0f;
     private boolean mIsHighQuality = false;
+    private ImageLoader mImageLoader = null;
 
     protected Vector<ImageFilter> mFilters = new Vector<ImageFilter>();
     protected String mName = "Original";
@@ -48,7 +50,9 @@ public class ImagePreset {
                 mImageBorder = source.mImageBorder.clone();
             }
             for (int i = 0; i < source.mFilters.size(); i++) {
-                add(source.mFilters.elementAt(i).clone());
+                ImageFilter filter = source.mFilters.elementAt(i).clone();
+                filter.setImagePreset(this);
+                add(filter);
             }
         } catch (java.lang.CloneNotSupportedException e) {
             Log.v(LOGTAG, "Exception trying to clone: " + e);
@@ -56,6 +60,7 @@ public class ImagePreset {
         mName = source.name();
         mHistoryName = source.name();
         mIsFxPreset = source.isFx();
+        mImageLoader = source.getImageLoader();
 
         mGeoData.set(source.mGeoData);
     }
@@ -118,6 +123,14 @@ public class ImagePreset {
         mHistoryName = name;
     }
 
+    public ImageLoader getImageLoader() {
+        return mImageLoader;
+    }
+
+    public void setImageLoader(ImageLoader mImageLoader) {
+        this.mImageLoader = mImageLoader;
+    }
+
     public boolean same(ImagePreset preset) {
         if (preset.mFilters.size() != mFilters.size()) {
             return false;
@@ -186,7 +199,7 @@ public class ImagePreset {
             mFilters.add(filter);
             setHistoryName(filter.getName());
         }
-
+        filter.setImagePreset(this);
     }
 
     public void remove(String filterName) {
-- 
cgit v1.2.3