1 files changed, 14 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index cc7ec881e..0fb157d7b 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -38,6 +38,7 @@ public class FilterRepresentation {
     private int mOverlayId = 0;
     private boolean mOverlayOnly = false;
     private boolean mShowParameterValue = true;
+    private boolean mIsBooleanFilter = false;
     private String mSerializationName;
     public static final byte TYPE_BORDER = 1;
     public static final byte TYPE_FX = 2;
@@ -69,7 +70,7 @@ public class FilterRepresentation {
         representation.setOverlayOnly(getOverlayOnly());
         representation.setShowParameterValue(showParameterValue());
         representation.mSerializationName = mSerializationName;
-
+        representation.setIsBooleanFilter(isBooleanFilter());
     }
 
     public boolean equals(FilterRepresentation representation) {
@@ -87,12 +88,21 @@ public class FilterRepresentation {
                 && representation.mButtonId == mButtonId
                 && representation.mOverlayId == mOverlayId
                 && representation.mOverlayOnly == mOverlayOnly
-                && representation.mShowParameterValue == mShowParameterValue) {
+                && representation.mShowParameterValue == mShowParameterValue
+                && representation.mIsBooleanFilter == mIsBooleanFilter) {
             return true;
         }
         return false;
     }
 
+    public boolean isBooleanFilter() {
+        return mIsBooleanFilter;
+    }
+
+    public void setIsBooleanFilter(boolean value) {
+        mIsBooleanFilter = value;
+    }
+
     @Override
     public String toString() {
         return mName;
@@ -261,7 +271,8 @@ public class FilterRepresentation {
     }
 
     public boolean canMergeWith(FilterRepresentation representation) {
-        if (representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) {
+        if (getFilterType() == FilterRepresentation.TYPE_GEOMETRY
+            && representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) {
             return true;
         }
         return false;