summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-05-31 15:51:56 -0700
committerztenghui <ztenghui@google.com>2013-05-31 15:57:41 -0700
commitc2efb326a63e869b2e1e5fcf693795d68eb66bfe (patch)
tree23c233bafe3db563a3c666523a33e29b5f36d477 /src/com
parentae3d53c4e53b3a3fb4f785ddc17ca5c5251e311c (diff)
downloadandroid_packages_apps_Snap-c2efb326a63e869b2e1e5fcf693795d68eb66bfe.tar.gz
android_packages_apps_Snap-c2efb326a63e869b2e1e5fcf693795d68eb66bfe.tar.bz2
android_packages_apps_Snap-c2efb326a63e869b2e1e5fcf693795d68eb66bfe.zip
Add LUT3D filter state saving
Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index 1ceffb4a2..d0ba302c7 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -16,8 +16,6 @@
package com.android.gallery3d.filtershow.filters;
-import android.graphics.Bitmap;
-import com.android.gallery3d.app.Log;
import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
public class FilterFxRepresentation extends FilterRepresentation {
@@ -30,7 +28,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
public FilterFxRepresentation(String name, int bitmapResource, int nameResource) {
super(name);
- setSerializationName(SERIALIZATION_NAME);
+ setSerializationName(SERIALIZATION_NAME + "_" + name);
mBitmapResource = bitmapResource;
mNameResource = nameResource;
@@ -44,6 +42,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
setSupportsPartialRendering(true);
}
+ @Override
public String toString() {
return "FilterFx: " + hashCode() + " : " + getName() + " bitmap rsc: " + mBitmapResource;
}
@@ -57,6 +56,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
return representation;
}
+ @Override
public synchronized void useParametersFrom(FilterRepresentation a) {
if (a instanceof FilterFxRepresentation) {
FilterFxRepresentation representation = (FilterFxRepresentation) a;
@@ -81,6 +81,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
return false;
}
+ @Override
public boolean same(FilterRepresentation representation) {
if (!super.same(representation)) {
return false;
@@ -88,6 +89,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
return equals(representation);
}
+ @Override
public boolean allowsMultipleInstances() {
return true;
}