Removing unused UI fields in FilterRepresentation.
Bug: 9170644
Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index bdcd83c..1cef271 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -376,9 +376,9 @@
for (int i = 0; i < borders.size(); i++) {
FilterRepresentation filter = borders.elementAt(i);
- filter.setScrName(getString(R.string.borders));
+ filter.setName(getString(R.string.borders));
if (i == 0) {
- filter.setScrName(getString(R.string.none));
+ filter.setName(getString(R.string.none));
}
}
diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java
index 4f2c128..506b2bf 100644
--- a/src/com/android/gallery3d/filtershow/category/Action.java
+++ b/src/com/android/gallery3d/filtershow/category/Action.java
@@ -149,7 +149,7 @@
mRepresentation.getOverlayId());
}
if (mOverlayBitmap != null) {
- if (getRepresentation().getPriority() == FilterRepresentation.TYPE_BORDER) {
+ if (getRepresentation().getFilterType() == FilterRepresentation.TYPE_BORDER) {
Canvas canvas = new Canvas(mImage);
canvas.drawBitmap(mOverlayBitmap, new Rect(0, 0, mOverlayBitmap.getWidth(), mOverlayBitmap.getHeight()),
new Rect(0, 0, mImage.getWidth(), mImage.getHeight()), new Paint());
diff --git a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
index cfa64bc..ba0ff33 100644
--- a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
@@ -26,6 +26,7 @@
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
+import com.android.gallery3d.filtershow.filters.FilterTinyPlanetRepresentation;
import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
import com.android.gallery3d.filtershow.presets.ImagePreset;
@@ -158,8 +159,8 @@
for (int i = 0; i < getCount(); i++) {
Action action = getItem(i);
if (action.getRepresentation() != null
- && action.getRepresentation().getFilterClass()
- == ImageFilterTinyPlanet.class) {
+ && action.getRepresentation()
+ instanceof FilterTinyPlanetRepresentation) {
return action.getRepresentation();
}
}
@@ -170,8 +171,8 @@
for (int i = 0; i < getCount(); i++) {
Action action = getItem(i);
if (action.getRepresentation() != null
- && action.getRepresentation().getFilterClass()
- == ImageFilterTinyPlanet.class) {
+ && action.getRepresentation()
+ instanceof FilterTinyPlanetRepresentation) {
remove(action);
return;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
index b2664a3..99e1edf 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
@@ -29,13 +29,10 @@
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 @@
@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 a32068a..4554f9b 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -18,12 +18,9 @@
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 9b144b9..dcc325d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -49,11 +49,10 @@
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 d0ba302..2dbff94 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -29,16 +29,13 @@
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 f67254c..d790d3e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
@@ -24,14 +24,12 @@
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 fc01650..aa52893 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
@@ -25,7 +25,7 @@
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 3bb60bb..701fabb 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -31,9 +31,7 @@
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 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 @@
&& 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 @@
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 @@
mTextId = textId;
}
- public int getButtonId() {
- return mButtonId;
- }
-
- public void setButtonId(int buttonId) {
- mButtonId = buttonId;
- }
-
public int getOverlayId() {
return mOverlayId;
}
@@ -227,14 +209,6 @@
mEditorId = editorId;
}
- public boolean showEditingControls() {
- return mShowEditingControls;
- }
-
- public void setShowEditingControls(boolean showEditingControls) {
- mShowEditingControls = showEditingControls;
- }
-
public boolean showParameterValue() {
return mShowParameterValue;
}
@@ -243,14 +217,6 @@
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 48c8b38..b03751e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
@@ -30,9 +30,8 @@
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 9827088..06a9953 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
@@ -31,13 +31,11 @@
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/filters/ImageFilterBwFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
index 64c48df..50837ca 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
@@ -38,7 +38,6 @@
representation.setMaximum(180);
representation.setMinimum(-180);
representation.setTextId(R.string.bwfilter);
- representation.setButtonId(R.id.bwfilterButton);
representation.setSupportsPartialRendering(true);
return representation;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
index c8b41c2..27c0e08 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
@@ -35,8 +35,6 @@
representation.setFilterClass(ImageFilterContrast.class);
representation.setTextId(R.string.contrast);
- representation.setButtonId(R.id.contrastButton);
-
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
index ea2ff35..20ed96c 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
@@ -45,7 +45,6 @@
representation.setDefaultValue(50);
representation.setPreviewValue(3);
representation.setTextId(R.string.downsample);
- representation.setButtonId(R.id.downsampleButton);
return representation;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
index 82de2b7..2d0d765 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
@@ -32,7 +32,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterEdge.class);
representation.setTextId(R.string.edge);
- representation.setButtonId(R.id.edgeButton);
representation.setSupportsPartialRendering(true);
return representation;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
index 6fdcd24..69eab73 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
@@ -33,7 +33,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterExposure.class);
representation.setTextId(R.string.exposure);
- representation.setButtonId(R.id.exposureButton);
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
index 0725dd1..4c837e0 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
@@ -38,7 +38,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterHighlights.class);
representation.setTextId(R.string.highlight_recovery);
- representation.setButtonId(R.id.highlightRecoveryButton);
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
index 7e6f685..b87c254 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
@@ -39,7 +39,6 @@
representation.setMinimum(-180);
representation.setMaximum(180);
representation.setTextId(R.string.hue);
- representation.setButtonId(R.id.hueButton);
representation.setEditorId(BasicEditor.ID);
representation.setSupportsPartialRendering(true);
return representation;
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
index 9381381..77cdf47 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
@@ -45,7 +45,6 @@
representation.setDefaultValue(4);
representation.setPreviewValue(4);
representation.setTextId(R.string.kmeans);
- representation.setButtonId(R.id.kmeansButton);
representation.setSupportsPartialRendering(true);
return representation;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
index 0747190..9849759 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
@@ -16,8 +16,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterNegative.class);
representation.setTextId(R.string.negative);
- representation.setButtonId(R.id.negativeButton);
- representation.setShowEditingControls(false);
representation.setShowParameterValue(false);
representation.setEditorId(ImageOnlyEditor.ID);
representation.setSupportsPartialRendering(true);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
index adc74c5..c3124ff 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
@@ -34,7 +34,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterSaturated.class);
representation.setTextId(R.string.saturation);
- representation.setButtonId(R.id.saturationButton);
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
index 845290b..bd119bb 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
@@ -34,7 +34,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterShadows.class);
representation.setTextId(R.string.shadow_recovery);
- representation.setButtonId(R.id.shadowRecoveryButton);
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
index 1dc2c05..3bd7944 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
@@ -35,7 +35,6 @@
representation.setShowParameterValue(true);
representation.setFilterClass(ImageFilterSharpen.class);
representation.setTextId(R.string.sharpness);
- representation.setButtonId(R.id.sharpenButton);
representation.setOverlayId(R.drawable.filtershow_button_colors_sharpen);
representation.setEditorId(R.id.imageShow);
representation.setSupportsPartialRendering(true);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
index 900fd90..86be9a1 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
@@ -33,7 +33,6 @@
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterVibrance.class);
representation.setTextId(R.string.vibrance);
- representation.setButtonId(R.id.vibranceButton);
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
index 84a14c9..6bb88ec 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
@@ -33,10 +33,8 @@
FilterRepresentation representation = new FilterDirectRepresentation("WBalance");
representation.setSerializationName(SERIALIZATION_NAME);
representation.setFilterClass(ImageFilterWBalance.class);
- representation.setPriority(FilterRepresentation.TYPE_WBALANCE);
+ representation.setFilterType(FilterRepresentation.TYPE_WBALANCE);
representation.setTextId(R.string.wbalance);
- representation.setButtonId(R.id.wbalanceButton);
- representation.setShowEditingControls(false);
representation.setShowParameterValue(false);
representation.setEditorId(ImageOnlyEditor.ID);
representation.setSupportsPartialRendering(true);
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 8476695..f06e048 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -218,11 +218,11 @@
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 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 @@
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);