diff options
Diffstat (limited to 'src/com/android')
3 files changed, 14 insertions, 16 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 92ce2309e..1a7d200f1 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -360,19 +360,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, ImageFilter.setActivityForMemoryToasts(this); Resources res = getResources(); - // TODO: add a mechanism to set the resources in FiltersManagmer - ImageFilterBorder filterBorder = (ImageFilterBorder) FiltersManager.getManager().getFilter(ImageFilterBorder.class); - filterBorder.setResources(res); - filterBorder = (ImageFilterBorder) FiltersManager.getPreviewManager().getFilter(ImageFilterBorder.class); - filterBorder.setResources(res); - filterBorder = (ImageFilterBorder) FiltersManager.getHighresManager().getFilter(ImageFilterBorder.class); - filterBorder.setResources(res); - ImageFilterFx filterFx = (ImageFilterFx) FiltersManager.getManager().getFilter(ImageFilterFx.class); - filterFx.setResources(res); - filterFx = (ImageFilterFx) FiltersManager.getPreviewManager().getFilter(ImageFilterFx.class); - filterFx.setResources(res); - filterFx = (ImageFilterFx) FiltersManager.getHighresManager().getFilter(ImageFilterFx.class); - filterFx.setResources(res); + FiltersManager.setResources(res); ImageShow.setDefaultBackgroundColor(res.getColor(R.color.background_screen)); // TODO: get those values from XML. diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index a295647b5..e63323b92 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -131,9 +131,12 @@ public class FilteringPipeline implements Handler.Callback { Process.THREAD_PRIORITY_FOREGROUND); mHandlerThread.start(); mProcessingHandler = new Handler(mHandlerThread.getLooper(), this); - mAccessoryPipeline = new CachingPipeline(FiltersManager.getManager(), "Accessory"); - mPreviewPipeline = new CachingPipeline(FiltersManager.getPreviewManager(), "Preview"); - mHighresPreviewPipeline = new CachingPipeline(FiltersManager.getHighresManager(), "Highres"); + mAccessoryPipeline = new CachingPipeline( + FiltersManager.getManager(), "Accessory"); + mPreviewPipeline = new CachingPipeline( + FiltersManager.getPreviewManager(), "Preview"); + mHighresPreviewPipeline = new CachingPipeline( + FiltersManager.getHighresManager(), "Highres"); } public synchronized static FilteringPipeline getPipeline() { diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index 232de6460..66ad10640 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -15,6 +15,7 @@ */ package com.android.gallery3d.filtershow.filters; +import android.content.res.Resources; import com.android.gallery3d.filtershow.presets.ImagePreset; import java.util.HashMap; @@ -140,4 +141,10 @@ public abstract class BaseFiltersManager { representations.add(getRepresentation(ImageFilterDraw.class)); } + public void setFilterResources(Resources resources) { + ImageFilterBorder filterBorder = (ImageFilterBorder) getFilter(ImageFilterBorder.class); + filterBorder.setResources(resources); + ImageFilterFx filterFx = (ImageFilterFx) getFilter(ImageFilterFx.class); + filterFx.setResources(resources); + } } |