Improves State panel and Refactor FilterShowActivity

- handles multiple xml layout
- add a portrait layout
- improves the state panel (delete, etc.)

Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2

1 files changed, 21 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 14c671e9f..82592a0f7 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -129,6 +129,9 @@ public class ImagePreset {
     }
 
     public void updateFilterRepresentation(FilterRepresentation representation) {
+        if (representation == null) {
+            return;
+        }
         synchronized (mFilters) {
             if (representation instanceof GeometryMetadata) {
                 setGeometry((GeometryMetadata) representation);
@@ -331,6 +334,23 @@ public class ImagePreset {
         Log.v(LOGTAG, "/// showFilters -- " + mFilters.size() + " filters");
     }
 
+    public FilterRepresentation getLastRepresentation() {
+        if (mFilters.size() > 0) {
+            return mFilters.lastElement();
+        }
+        return null;
+    }
+
+    public void removeFilter(FilterRepresentation filterRepresentation) {
+        for (int i = 0; i < mFilters.size(); i++) {
+            if (mFilters.elementAt(i).getFilterClass() == filterRepresentation.getFilterClass()) {
+                mFilters.remove(i);
+                setHistoryName("Remove");
+                return;
+            }
+        }
+    }
+
     public void addFilter(FilterRepresentation representation) {
         if (representation instanceof GeometryMetadata) {
             setGeometry((GeometryMetadata) representation);
@@ -501,4 +521,5 @@ public class ImagePreset {
     public Rect getPartialRenderingBounds() {
         return mPartialRenderingBounds;
     }
+
 }