diff options
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java index 467409fb8..99c809148 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java @@ -16,18 +16,26 @@ package com.android.gallery3d.filtershow.filters; -import android.graphics.drawable.Drawable; +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; public class FilterImageBorderRepresentation extends FilterRepresentation { - private Drawable mDrawable; private int mDrawableResource = 0; - public FilterImageBorderRepresentation(int drawableResource, Drawable drawable) { + public FilterImageBorderRepresentation(int drawableResource) { super("ImageBorder"); mDrawableResource = drawableResource; - mDrawable = drawable; setFilterClass(ImageFilterBorder.class); - setPriority(ImageFilter.TYPE_BORDER); + setPriority(FilterRepresentation.TYPE_BORDER); + setTextId(R.string.borders); + setEditorId(ImageOnlyEditor.ID); + setShowEditingControls(false); + setShowParameterValue(false); + setShowUtilityPanel(false); + // load the drawable at init as we are in a background thread + // (see FilterShowActivity's LoadBordersTask) + ImageFilterBorder filter = (ImageFilterBorder) FiltersManager.getManager().getFilter(getFilterClass()); + filter.getDrawable(getDrawableResource()); } public String toString() { @@ -38,7 +46,6 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { public FilterRepresentation clone() throws CloneNotSupportedException { FilterImageBorderRepresentation representation = (FilterImageBorderRepresentation) super.clone(); representation.setName(getName()); - representation.setDrawable(getDrawable()); representation.setDrawableResource(getDrawableResource()); return representation; } @@ -47,7 +54,6 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { if (a instanceof FilterImageBorderRepresentation) { FilterImageBorderRepresentation representation = (FilterImageBorderRepresentation) a; setName(representation.getName()); - setDrawable(representation.getDrawable()); setDrawableResource(representation.getDrawableResource()); } } @@ -66,16 +72,13 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { return false; } - public boolean allowsMultipleInstances() { - return true; - } - - public Drawable getDrawable() { - return mDrawable; + @Override + public int getTextId() { + return R.string.borders; } - public void setDrawable(Drawable drawable) { - mDrawable = drawable; + public boolean allowsMultipleInstances() { + return true; } public int getDrawableResource() { |