Modifications for simple edit

Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f

4 files changed, 47 insertions, 17 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 66edf3169..37d66f829 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -16,7 +16,7 @@
 
 package com.android.gallery3d.filtershow.filters;
 
-import com.android.gallery3d.app.Log;
+import android.util.Log;
 import com.android.gallery3d.filtershow.editors.BasicEditor;
 
 public class FilterRepresentation implements Cloneable {
diff --git a/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java b/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
index c454c1ab6..47f8dfccb 100644
--- a/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
+++ b/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
@@ -18,11 +18,9 @@ package com.android.gallery3d.filtershow.presets;
 
 import android.graphics.Bitmap;
 import android.support.v8.renderscript.Allocation;
-import android.util.Log;
 
-import com.android.gallery3d.filtershow.cache.CachingPipeline;
 import com.android.gallery3d.filtershow.filters.FilterRepresentation;
-import com.android.gallery3d.filtershow.filters.FiltersManager;
+import com.android.gallery3d.filtershow.filters.FiltersManagerInterface;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
 
 import java.lang.ref.WeakReference;
@@ -33,10 +31,14 @@ public class FilterEnvironment {
     private ImagePreset mImagePreset;
     private float mScaleFactor;
     private int mQuality;
-    private FiltersManager mFiltersManager;
-    private CachingPipeline mCachingPipeline;
+    private FiltersManagerInterface mFiltersManager;
+    private PipelineInterface mPipeline;
     private volatile boolean mStop = false;
 
+    public static final int QUALITY_ICON = 0;
+    public static final int QUALITY_PREVIEW = 1;
+    public static final int QUALITY_FINAL = 2;
+
     public synchronized boolean needsStop() {
         return mStop;
     }
@@ -98,11 +100,11 @@ public class FilterEnvironment {
         return mQuality;
     }
 
-    public void setFiltersManager(FiltersManager filtersManager) {
+    public void setFiltersManager(FiltersManagerInterface filtersManager) {
         mFiltersManager = filtersManager;
     }
 
-    public FiltersManager getFiltersManager() {
+    public FiltersManagerInterface getFiltersManager() {
         return mFiltersManager;
     }
 
@@ -126,12 +128,12 @@ public class FilterEnvironment {
         return ret;
     }
 
-    public CachingPipeline getCachingPipeline() {
-        return mCachingPipeline;
+    public PipelineInterface getPipeline() {
+        return mPipeline;
     }
 
-    public void setCachingPipeline(CachingPipeline cachingPipeline) {
-        mCachingPipeline = cachingPipeline;
+    public void setPipeline(PipelineInterface cachingPipeline) {
+        mPipeline = cachingPipeline;
     }
 
 }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 1b7a425e7..b594d9a02 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -50,9 +50,6 @@ public class ImagePreset {
     private static final String LOGTAG = "ImagePreset";
 
     private FilterRepresentation mBorder = null;
-    public static final int QUALITY_ICON = 0;
-    public static final int QUALITY_PREVIEW = 1;
-    public static final int QUALITY_FINAL = 2;
     public static final int STYLE_ICON = 3;
     public static final String PRESET_NAME = "PresetName";
 
@@ -472,7 +469,7 @@ public class ImagePreset {
         if (mBorder != null && mDoApplyGeometry) {
             mBorder.synchronizeRepresentation();
             bitmap = environment.applyRepresentation(mBorder, bitmap);
-            if (environment.getQuality() == QUALITY_FINAL) {
+            if (environment.getQuality() == FilterEnvironment.QUALITY_FINAL) {
                 UsageStatistics.onEvent(UsageStatistics.COMPONENT_EDITOR,
                         "SaveBorder", mBorder.getName(), 1);
             }
@@ -499,7 +496,7 @@ public class ImagePreset {
                     representation.synchronizeRepresentation();
                 }
                 bitmap = environment.applyRepresentation(representation, bitmap);
-                if (environment.getQuality() == QUALITY_FINAL) {
+                if (environment.getQuality() == FilterEnvironment.QUALITY_FINAL) {
                     UsageStatistics.onEvent(UsageStatistics.COMPONENT_EDITOR,
                             "SaveFilter", representation.getName(), 1);
                 }
diff --git a/src/com/android/gallery3d/filtershow/presets/PipelineInterface.java b/src/com/android/gallery3d/filtershow/presets/PipelineInterface.java
new file mode 100644
index 000000000..05f0a1aa8
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/presets/PipelineInterface.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gallery3d.filtershow.presets;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.support.v8.renderscript.Allocation;
+import android.support.v8.renderscript.RenderScript;
+
+public interface PipelineInterface {
+    public String getName();
+    public Resources getResources();
+    public Allocation getInPixelsAllocation();
+    public Allocation getOutPixelsAllocation();
+    public boolean prepareRenderscriptAllocations(Bitmap bitmap);
+    public RenderScript getRSContext();
+}