summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-19 15:32:12 -0700
committerJohn Hoford <hoford@google.com>2012-10-19 16:20:27 -0700
commitcdb0abb4e1e47c7bb5f278885f337013ed5af3d7 (patch)
tree5b9628fc7501692d1bd8f949c7ce4c911f39cb07 /src
parentb9c58019d580f2f662329dae26f24ac879923d67 (diff)
downloadandroid_packages_apps_Snap-cdb0abb4e1e47c7bb5f278885f337013ed5af3d7.tar.gz
android_packages_apps_Snap-cdb0abb4e1e47c7bb5f278885f337013ed5af3d7.tar.bz2
android_packages_apps_Snap-cdb0abb4e1e47c7bb5f278885f337013ed5af3d7.zip
Add the infrastructure to support Tiny Planet
bug:7293391 Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java17
1 files 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) {