commit 71e436c3c839b5dccb409e93abb6509b21144b14
author ztenghui <ztenghui@google.com> Fri May 31 15:51:56 2013 -0700
committer ztenghui <ztenghui@google.com> Fri May 31 15:57:41 2013 -0700
tree 78e886e92dd9653d91a4710d9d0386cf0c93a807
parent c58d6414da1cc38f07f0512f4debf92e8c738ca0

Add LUT3D filter state saving

Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018

src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java

diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index 1c7294c..4186b93 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -19,7 +19,6 @@
 import android.content.res.Resources;
 import android.util.Log;
 
-
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 
@@ -42,8 +41,8 @@
                 if (filterInstance instanceof ImageFilter) {
                     mFilters.put(filterClass, (ImageFilter) filterInstance);
 
-                    FilterRepresentation rep = 
-                    		((ImageFilter) filterInstance).getDefaultRepresentation();
+                    FilterRepresentation rep =
+                        ((ImageFilter) filterInstance).getDefaultRepresentation();
                     if (rep != null) {
                         addRepresentation(rep);
                     }
@@ -74,6 +73,7 @@
         return mFilters.get(c);
     }
 
+    @Override
     public ImageFilter getFilterForRepresentation(FilterRepresentation representation) {
         return mFilters.get(representation.getFilterClass());
     }
@@ -166,6 +166,7 @@
             FilterFxRepresentation fx = new FilterFxRepresentation(
                     context.getString(fxNameid[i]), drawid[i], fxNameid[i]);
             representations.add(fx);
+            addRepresentation(fx);
         }
     }
 

src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index 1ceffb4..d0ba302 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 FilterFxRepresentation(String name, int bitmapResource, int nameResource) {
         super(name);
-        setSerializationName(SERIALIZATION_NAME);
+        setSerializationName(SERIALIZATION_NAME + "_" + name);
 
         mBitmapResource = bitmapResource;
         mNameResource = nameResource;
@@ -44,6 +42,7 @@
         setSupportsPartialRendering(true);
     }
 
+    @Override
     public String toString() {
         return "FilterFx: " + hashCode() + " : " + getName() + " bitmap rsc: " + mBitmapResource;
     }
@@ -57,6 +56,7 @@
         return representation;
     }
 
+    @Override
     public synchronized void useParametersFrom(FilterRepresentation a) {
         if (a instanceof FilterFxRepresentation) {
             FilterFxRepresentation representation = (FilterFxRepresentation) a;
@@ -81,6 +81,7 @@
         return false;
     }
 
+    @Override
     public boolean same(FilterRepresentation representation) {
         if (!super.same(representation)) {
             return false;
@@ -88,6 +89,7 @@
         return equals(representation);
     }
 
+    @Override
     public boolean allowsMultipleInstances() {
         return true;
     }