summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/imageshow
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-01-18 08:59:35 -0800
committerJohn Hoford <hoford@google.com>2013-01-18 15:53:52 -0800
commit0cd4c8706f242f7a5d625e5b88509fc646859807 (patch)
tree83d08b8c5330037cae2fd358cc48bce33076a4c6 /src/com/android/gallery3d/filtershow/imageshow
parent6c95a5c97615593181365d8f320e733eb2df54e0 (diff)
downloadandroid_packages_apps_Snap-0cd4c8706f242f7a5d625e5b88509fc646859807.tar.gz
android_packages_apps_Snap-0cd4c8706f242f7a5d625e5b88509fc646859807.tar.bz2
android_packages_apps_Snap-0cd4c8706f242f7a5d625e5b88509fc646859807.zip
refactor the filter/editor relationship
Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java1
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageShow.java1
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/MasterImage.java2
3 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
index cca06e4d7..16c2422c2 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
@@ -46,7 +46,6 @@ public class ImageDraw extends ImageShow {
float[] mTmpPoint = new float[2]; // so we do not malloc
@Override
public boolean onTouchEvent(MotionEvent event) {
- super.onTouchEvent(event);
if (event.getPointerCount() != 1) {
return false;
}
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 55bdb6e8e..3d22e05ef 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -26,6 +26,7 @@ import android.graphics.RectF;
import android.net.Uri;
import android.os.Handler;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.GestureDetector;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener;
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 5dc7b172d..98bef52c7 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -181,12 +181,10 @@ public class MasterImage {
return;
}
- // FIXME getImageForPreset caller
Bitmap bitmap = mLoader.getImageForPreset(null, mPreset, true);
if (bitmap != null) {
mFilteredImage = bitmap;
- notifyObservers();
}
updatePresets(false);
if (mGeometryOnlyPreset != null) {