summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/MasterImage.java4
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 8f490ca5e..4ea944b7b 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -140,7 +140,9 @@ public class MasterImage implements RenderingRequestCaller {
}
public synchronized void setPreset(ImagePreset preset, boolean addToHistory) {
- preset.showFilters();
+ if (DEBUG) {
+ preset.showFilters();
+ }
mPreset = preset;
mPreset.setImageLoader(mLoader);
setGeometry();
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 5eddc9134..00effa825 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -471,7 +471,7 @@ public class ImagePreset {
bitmap = environment.applyRepresentation(mBorder, bitmap);
if (environment.getQuality() == FilterEnvironment.QUALITY_FINAL) {
UsageStatistics.onEvent(UsageStatistics.COMPONENT_EDITOR,
- "SaveBorder", mBorder.getName(), 1);
+ "SaveBorder", mBorder.getSerializationName(), 1);
}
}
return bitmap;