From 24d6ec7beb37eb3a5449f1fa49b4adb123391d24 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Fri, 12 Jul 2013 18:27:54 -0700 Subject: Add background processing service bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357 --- .../filtershow/filters/BaseFiltersManager.java | 108 ++++++++++++++++----- 1 file changed, 83 insertions(+), 25 deletions(-) (limited to 'src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java') diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index c0a6c139e..1d3a10d7a 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -20,8 +20,10 @@ import android.content.res.Resources; import android.util.Log; import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.imageshow.GeometryMetadata; import com.android.gallery3d.filtershow.pipeline.ImagePreset; +import java.util.ArrayList; import java.util.HashMap; import java.util.Vector; @@ -30,6 +32,11 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { protected HashMap mRepresentationLookup = null; private static final String LOGTAG = "BaseFiltersManager"; + protected ArrayList mLooks = new ArrayList(); + protected ArrayList mBorders = new ArrayList(); + protected ArrayList mTools = new ArrayList(); + protected ArrayList mEffects = new ArrayList(); + protected void init() { mFilters = new HashMap(); mRepresentationLookup = new HashMap(); @@ -133,11 +140,27 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { filters.add(ImageFilterGeometry.class); } - public void addBorders(Context context, Vector representations) { + public ArrayList getLooks() { + return mLooks; + } + + public ArrayList getBorders() { + return mBorders; + } + + public ArrayList getTools() { + return mTools; + } + public ArrayList getEffects() { + return mEffects; } - public void addLooks(Context context, Vector representations) { + public void addBorders(Context context) { + + } + + public void addLooks(Context context) { int[] drawid = { R.drawable.filtershow_fx_0005_punch, R.drawable.filtershow_fx_0000_vintage, @@ -175,37 +198,72 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { "LUT3D_XPROCESS" }; + FilterFxRepresentation nullFx = + new FilterFxRepresentation(context.getString(R.string.none), + 0, R.string.none); + mLooks.add(nullFx); + for (int i = 0; i < drawid.length; i++) { FilterFxRepresentation fx = new FilterFxRepresentation( context.getString(fxNameid[i]), drawid[i], fxNameid[i]); fx.setSerializationName(serializationNames[i]); - representations.add(fx); + mLooks.add(fx); addRepresentation(fx); } } - public void addEffects(Vector representations) { - representations.add(getRepresentation(ImageFilterTinyPlanet.class)); - representations.add(getRepresentation(ImageFilterWBalance.class)); - representations.add(getRepresentation(ImageFilterExposure.class)); - representations.add(getRepresentation(ImageFilterVignette.class)); - representations.add(getRepresentation(ImageFilterContrast.class)); - representations.add(getRepresentation(ImageFilterShadows.class)); - representations.add(getRepresentation(ImageFilterHighlights.class)); - representations.add(getRepresentation(ImageFilterVibrance.class)); - representations.add(getRepresentation(ImageFilterSharpen.class)); - representations.add(getRepresentation(ImageFilterCurves.class)); - representations.add(getRepresentation(ImageFilterHue.class)); - representations.add(getRepresentation(ImageFilterSaturated.class)); - representations.add(getRepresentation(ImageFilterBwFilter.class)); - representations.add(getRepresentation(ImageFilterNegative.class)); - representations.add(getRepresentation(ImageFilterEdge.class)); - representations.add(getRepresentation(ImageFilterKMeans.class)); - } - - public void addTools(Vector representations) { - representations.add(getRepresentation(ImageFilterRedEye.class)); - representations.add(getRepresentation(ImageFilterDraw.class)); + public void addEffects() { + mEffects.add(getRepresentation(ImageFilterTinyPlanet.class)); + mEffects.add(getRepresentation(ImageFilterWBalance.class)); + mEffects.add(getRepresentation(ImageFilterExposure.class)); + mEffects.add(getRepresentation(ImageFilterVignette.class)); + mEffects.add(getRepresentation(ImageFilterContrast.class)); + mEffects.add(getRepresentation(ImageFilterShadows.class)); + mEffects.add(getRepresentation(ImageFilterHighlights.class)); + mEffects.add(getRepresentation(ImageFilterVibrance.class)); + mEffects.add(getRepresentation(ImageFilterSharpen.class)); + mEffects.add(getRepresentation(ImageFilterCurves.class)); + mEffects.add(getRepresentation(ImageFilterHue.class)); + mEffects.add(getRepresentation(ImageFilterSaturated.class)); + mEffects.add(getRepresentation(ImageFilterBwFilter.class)); + mEffects.add(getRepresentation(ImageFilterNegative.class)); + mEffects.add(getRepresentation(ImageFilterEdge.class)); + mEffects.add(getRepresentation(ImageFilterKMeans.class)); + } + + public void addTools(Context context) { + GeometryMetadata geo = new GeometryMetadata(); + int[] editorsId = geo.getEditorIds(); + + int[] textId = { + R.string.crop, + R.string.straighten, + R.string.rotate, + R.string.mirror + }; + + int[] overlayId = { + R.drawable.filtershow_button_geometry_crop, + R.drawable.filtershow_button_geometry_straighten, + R.drawable.filtershow_button_geometry_rotate, + R.drawable.filtershow_button_geometry_flip + }; + + for (int i = 0; i < editorsId.length; i++) { + int editorId = editorsId[i]; + GeometryMetadata geometry = new GeometryMetadata(geo); + geometry.setEditorId(editorId); + geometry.setTextId(textId[i]); + geometry.setOverlayId(overlayId[i]); + geometry.setOverlayOnly(true); + if (geometry.getTextId() != 0) { + geometry.setName(context.getString(geometry.getTextId())); + } + mTools.add(geometry); + } + + mTools.add(getRepresentation(ImageFilterRedEye.class)); + mTools.add(getRepresentation(ImageFilterDraw.class)); } public void setFilterResources(Resources resources) { -- cgit v1.2.3