diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-03-20 19:48:49 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-03-20 19:52:44 -0700 |
| commit | 0ac3415c9b28f492614462641b87792c477de2f4 (patch) | |
| tree | b7b68ff1ff1f4a3deab6f7f7b71f7c889a39ebd0 /src | |
| parent | fdc3d8bcea0cee2caa5a2662fb202e8876e18abb (diff) | |
| download | android_packages_apps_Snap-0ac3415c9b28f492614462641b87792c477de2f4.tar.gz android_packages_apps_Snap-0ac3415c9b28f492614462641b87792c477de2f4.tar.bz2 android_packages_apps_Snap-0ac3415c9b28f492614462641b87792c477de2f4.zip | |
Don't show the original image in the Curves editor
Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageShow.java | 11 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/ui/ImageCurves.java | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 2de37f6fe..38dc17719 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -28,7 +28,6 @@ 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; @@ -51,7 +50,7 @@ public class ImageShow extends View implements OnGestureListener, private static final String LOGTAG = "ImageShow"; private static final boolean ENABLE_HISTORY_SWAP = false; - private static final boolean ENABLE_COMPARISON = false; + private static final boolean ENABLE_ZOOMED_COMPARISON = false; protected Paint mPaint = new Paint(); protected static int mTextSize = 24; @@ -579,7 +578,7 @@ public class ImageShow extends View implements OnGestureListener, mTouch.y = ey; float scaleFactor = MasterImage.getImage().getScaleFactor(); - if (scaleFactor > 1 && (!ENABLE_COMPARISON || event.getPointerCount() == 2)) { + if (scaleFactor > 1 && (!ENABLE_ZOOMED_COMPARISON || event.getPointerCount() == 2)) { float translateX = (mTouch.x - mTouchDown.x) / scaleFactor; float translateY = (mTouch.y - mTouchDown.y) / scaleFactor; Point originalTranslation = MasterImage.getImage().getOriginalTranslation(); @@ -588,7 +587,7 @@ public class ImageShow extends View implements OnGestureListener, translation.y = (int) (originalTranslation.y + translateY); MasterImage.getImage().setTranslation(translation); mTouchShowOriginal = false; - } else if (!mOriginalDisabled && !mActivity.isShowingHistoryPanel() + } else if (enableComparison() && !mOriginalDisabled && !mActivity.isShowingHistoryPanel() && (System.currentTimeMillis() - mTouchShowOriginalDate > mTouchShowOriginalDelayMin) && event.getPointerCount() == 1) { @@ -611,6 +610,10 @@ public class ImageShow extends View implements OnGestureListener, return true; } + protected boolean enableComparison() { + return true; + } + // listview stuff public void showOriginal(boolean show) { invalidate(); diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java index 04eed946b..e5ffd8b68 100644 --- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java +++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java @@ -79,6 +79,11 @@ public class ImageCurves extends ImageShow { } @Override + protected boolean enableComparison() { + return false; + } + + @Override public boolean useUtilityPanel() { return true; } |