Removing unused UI fields in FilterRepresentation.

Bug: 9170644

Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2

10 files changed, 22 insertions, 70 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
index b2664a30f..99e1edf9a 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
@@ -29,13 +29,10 @@ public class FilterColorBorderRepresentation extends FilterRepresentation {
         mColor = color;
         mBorderSize = size;
         mBorderRadius = radius;
-        setFilterClass(ImageFilterParametricBorder.class);
-        setPriority(FilterRepresentation.TYPE_BORDER);
+        setFilterType(FilterRepresentation.TYPE_BORDER);
         setTextId(R.string.borders);
         setEditorId(ImageOnlyEditor.ID);
-        setShowEditingControls(false);
         setShowParameterValue(false);
-        setShowUtilityPanel(false);
     }
 
     public String toString() {
@@ -44,6 +41,7 @@ public class FilterColorBorderRepresentation extends FilterRepresentation {
 
     @Override
     public FilterRepresentation clone() throws CloneNotSupportedException {
+        setFilterClass(ImageFilterParametricBorder.class);
         FilterColorBorderRepresentation representation = (FilterColorBorderRepresentation) super.clone();
         representation.setName(getName());
         representation.setColor(getColor());
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
index a32068aeb..4554f9b6d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -18,12 +18,9 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
         setSerializationName("CURVES");
         setFilterClass(ImageFilterCurves.class);
         setTextId(R.string.curvesRGB);
-        setButtonId(R.id.curvesButtonRGB);
         setOverlayId(R.drawable.filtershow_button_colors_curve);
         setEditorId(R.id.imageCurves);
-        setShowEditingControls(false);
         setShowParameterValue(false);
-        setShowUtilityPanel(true);
         setSupportsPartialRendering(true);
         reset();
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index 9b144b9e9..dcc325d6e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -49,11 +49,10 @@ public class FilterDrawRepresentation extends FilterRepresentation {
 
     public FilterDrawRepresentation() {
         super("Draw");
-        setSerializationName("DRAW");
         setFilterClass(ImageFilterDraw.class);
-        setPriority(FilterRepresentation.TYPE_VIGNETTE);
+        setSerializationName("DRAW");
+        setFilterType(FilterRepresentation.TYPE_VIGNETTE);
         setTextId(R.string.imageDraw);
-        setButtonId(R.id.drawOnImageButton);
         setEditorId(EditorDraw.ID);
         setOverlayId(R.drawable.filtershow_drawing);
         setOverlayOnly(true);
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index d0ba302c7..2dbff94bd 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -29,16 +29,13 @@ public class FilterFxRepresentation extends FilterRepresentation {
     public FilterFxRepresentation(String name, int bitmapResource, int nameResource) {
         super(name);
         setSerializationName(SERIALIZATION_NAME + "_" + name);
-
+        setFilterClass(ImageFilterFx.class);
         mBitmapResource = bitmapResource;
         mNameResource = nameResource;
-        setFilterClass(ImageFilterFx.class);
-        setPriority(FilterRepresentation.TYPE_FX);
+        setFilterType(FilterRepresentation.TYPE_FX);
         setTextId(nameResource);
         setEditorId(ImageOnlyEditor.ID);
-        setShowEditingControls(false);
         setShowParameterValue(false);
-        setShowUtilityPanel(false);
         setSupportsPartialRendering(true);
     }
 
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
index f67254c63..d790d3ef7 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
@@ -24,14 +24,12 @@ public class FilterImageBorderRepresentation extends FilterRepresentation {
 
     public FilterImageBorderRepresentation(int drawableResource) {
         super("ImageBorder");
-        mDrawableResource = drawableResource;
         setFilterClass(ImageFilterBorder.class);
-        setPriority(FilterRepresentation.TYPE_BORDER);
+        mDrawableResource = drawableResource;
+        setFilterType(FilterRepresentation.TYPE_BORDER);
         setTextId(R.string.borders);
         setEditorId(ImageOnlyEditor.ID);
-        setShowEditingControls(false);
         setShowParameterValue(false);
-        setShowUtilityPanel(false);
     }
 
     public String toString() {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
index fc01650ae..aa5289393 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
@@ -25,7 +25,7 @@ public abstract class FilterPointRepresentation extends FilterRepresentation {
     public FilterPointRepresentation(String type, int textid, int editorID) {
         super(type);
         setFilterClass(ImageFilterRedEye.class);
-        setPriority(FilterRepresentation.TYPE_NORMAL);
+        setFilterType(FilterRepresentation.TYPE_NORMAL);
         setTextId(textid);
         setEditorId(editorID);
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 3bb60bb74..701fabba7 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -31,9 +31,7 @@ public class FilterRepresentation implements Cloneable {
     private int mButtonId = 0;
     private int mOverlayId = 0;
     private boolean mOverlayOnly = false;
-    private boolean mShowEditingControls = true;
     private boolean mShowParameterValue = true;
-    private boolean mShowUtilityPanel = true;
     private String mSerializationName;
     public static final byte TYPE_BORDER = 1;
     public static final byte TYPE_FX = 2;
@@ -52,17 +50,14 @@ public class FilterRepresentation implements Cloneable {
     public FilterRepresentation clone() throws CloneNotSupportedException {
         FilterRepresentation representation = (FilterRepresentation) super.clone();
         representation.setName(getName());
-        representation.setPriority(getPriority());
         representation.setFilterClass(getFilterClass());
+        representation.setFilterType(getFilterType());
         representation.setSupportsPartialRendering(supportsPartialRendering());
         representation.setTextId(getTextId());
         representation.setEditorId(getEditorId());
-        representation.setButtonId(getButtonId());
         representation.setOverlayId(getOverlayId());
         representation.setOverlayOnly(getOverlayOnly());
-        representation.setShowEditingControls(showEditingControls());
         representation.setShowParameterValue(showParameterValue());
-        representation.setShowUtilityPanel(showUtilityPanel());
         representation.mSerializationName = mSerializationName;
 
         representation.mTempRepresentation =
@@ -86,22 +81,17 @@ public class FilterRepresentation implements Cloneable {
                 && representation.mButtonId == mButtonId
                 && representation.mOverlayId == mOverlayId
                 && representation.mOverlayOnly == mOverlayOnly
-                && representation.mShowEditingControls == mShowEditingControls
-                && representation.mShowParameterValue == mShowParameterValue
-                && representation.mShowUtilityPanel == mShowUtilityPanel) {
+                && representation.mShowParameterValue == mShowParameterValue) {
             return true;
         }
         return false;
     }
 
+    @Override
     public String toString() {
         return mName;
     }
 
-    public void setScrName(String name) {
-        mName = name;
-    }
-
     public void setName(String name) {
         mName = name;
     }
@@ -118,11 +108,11 @@ public class FilterRepresentation implements Cloneable {
         return mSerializationName;
     }
 
-    public void setPriority(int priority) {
+    public void setFilterType(int priority) {
         mPriority = priority;
     }
 
-    public int getPriority() {
+    public int getFilterType() {
         return mPriority;
     }
 
@@ -190,14 +180,6 @@ public class FilterRepresentation implements Cloneable {
         mTextId = textId;
     }
 
-    public int getButtonId() {
-        return mButtonId;
-    }
-
-    public void setButtonId(int buttonId) {
-        mButtonId = buttonId;
-    }
-
     public int getOverlayId() {
         return mOverlayId;
     }
@@ -227,14 +209,6 @@ public class FilterRepresentation implements Cloneable {
         mEditorId = editorId;
     }
 
-    public boolean showEditingControls() {
-        return mShowEditingControls;
-    }
-
-    public void setShowEditingControls(boolean showEditingControls) {
-        mShowEditingControls = showEditingControls;
-    }
-
     public boolean showParameterValue() {
         return mShowParameterValue;
     }
@@ -243,14 +217,6 @@ public class FilterRepresentation implements Cloneable {
         mShowParameterValue = showParameterValue;
     }
 
-    public boolean showUtilityPanel() {
-        return mShowUtilityPanel;
-    }
-
-    public void setShowUtilityPanel(boolean showUtilityPanel) {
-        mShowUtilityPanel = showUtilityPanel;
-    }
-
     public String getStateRepresentation() {
         return "";
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
index 48c8b380e..b03751e7c 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
@@ -30,9 +30,8 @@ public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
         setSerializationName(SERIALIZATION_NAME);
         setShowParameterValue(true);
         setFilterClass(ImageFilterTinyPlanet.class);
-        setPriority(FilterRepresentation.TYPE_TINYPLANET);
+        setFilterType(FilterRepresentation.TYPE_TINYPLANET);
         setTextId(R.string.tinyplanet);
-        setButtonId(R.id.tinyplanetButton);
         setEditorId(EditorTinyPlanet.ID);
         setMinimum(1);
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
index 9827088ff..06a9953b1 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
@@ -31,13 +31,11 @@ public class FilterVignetteRepresentation extends FilterBasicRepresentation impl
         super("Vignette", -100, 50, 100);
         setSerializationName("VIGNETTE");
         setShowParameterValue(true);
-        setPriority(FilterRepresentation.TYPE_VIGNETTE);
+        setFilterType(FilterRepresentation.TYPE_VIGNETTE);
         setTextId(R.string.vignette);
-        setButtonId(R.id.vignetteEditor);
         setEditorId(EditorVignette.ID);
         setName("Vignette");
         setFilterClass(ImageFilterVignette.class);
-
         setMinimum(-100);
         setMaximum(100);
         setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 84766958d..f06e048a2 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -218,11 +218,11 @@ public class ImagePreset {
             return false;
         }
         for (FilterRepresentation representation : mFilters) {
-            if (representation.getPriority() == FilterRepresentation.TYPE_VIGNETTE
+            if (representation.getFilterType() == FilterRepresentation.TYPE_VIGNETTE
                     && !representation.isNil()) {
                 return false;
             }
-            if (representation.getPriority() == FilterRepresentation.TYPE_TINYPLANET
+            if (representation.getFilterType() == FilterRepresentation.TYPE_TINYPLANET
                     && !representation.isNil()) {
                 return false;
             }
@@ -380,7 +380,7 @@ public class ImagePreset {
     }
 
     public void removeFilter(FilterRepresentation filterRepresentation) {
-        if (filterRepresentation.getPriority() == FilterRepresentation.TYPE_BORDER) {
+        if (filterRepresentation.getFilterType() == FilterRepresentation.TYPE_BORDER) {
             setBorder(null);
             setHistoryName("Remove");
             return;
@@ -399,13 +399,13 @@ public class ImagePreset {
             setGeometry((GeometryMetadata) representation);
             return;
         }
-        if (representation.getPriority() == FilterRepresentation.TYPE_BORDER) {
+        if (representation.getFilterType() == FilterRepresentation.TYPE_BORDER) {
             setHistoryName(representation.getName());
             setBorder(representation);
-        } else if (representation.getPriority() == FilterRepresentation.TYPE_FX) {
+        } else if (representation.getFilterType() == FilterRepresentation.TYPE_FX) {
             boolean found = false;
             for (int i = 0; i < mFilters.size(); i++) {
-                int type = mFilters.elementAt(i).getPriority();
+                int type = mFilters.elementAt(i).getFilterType();
                 if (found) {
                     if (type != FilterRepresentation.TYPE_VIGNETTE) {
                         mFilters.remove(i);