summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-06-17 14:32:37 -0700
committerRuben Brunk <rubenbrunk@google.com>2013-06-17 14:41:32 -0700
commit3126f4f5c0c241f7fb895cc8222954a7f7cbfdfe (patch)
tree7d1aabc480119dd8664bdb26a8699d4241eca1c6 /src/com/android
parentd67ffd653bada5d4dcdca1f7a3c3a7aab1b51360 (diff)
downloadandroid_packages_apps_Snap-3126f4f5c0c241f7fb895cc8222954a7f7cbfdfe.tar.gz
android_packages_apps_Snap-3126f4f5c0c241f7fb895cc8222954a7f7cbfdfe.tar.bz2
android_packages_apps_Snap-3126f4f5c0c241f7fb895cc8222954a7f7cbfdfe.zip
Added serialization IDs for frames, adds frames to analytics.
Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
Diffstat (limited to 'src/com/android')
-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;