diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-03-14 18:23:53 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-03-14 18:23:53 -0700 |
| commit | e06880d55d8c98491b95d6f8c0cdb1653d90c557 (patch) | |
| tree | 3611f39b168e766ae45f31a13c846f56b8e9d1e7 | |
| parent | 61872e727127150b5a2bd5e7da30f92f8737b6b7 (diff) | |
| download | android_packages_apps_Snap-e06880d55d8c98491b95d6f8c0cdb1653d90c557.tar.gz android_packages_apps_Snap-e06880d55d8c98491b95d6f8c0cdb1653d90c557.tar.bz2 android_packages_apps_Snap-e06880d55d8c98491b95d6f8c0cdb1653d90c557.zip | |
Enable touch panning by default
Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageShow.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 0b2f96abb..0ed8c3c29 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -50,6 +50,8 @@ public class ImageShow extends View implements OnGestureListener, OnDoubleTapListener { private static final String LOGTAG = "ImageShow"; + private static final boolean ENABLE_HISTORY_SWAP = false; + private static final boolean ENABLE_COMPARISON = false; protected Paint mPaint = new Paint(); protected static int mTextSize = 24; @@ -576,7 +578,7 @@ public class ImageShow extends View implements OnGestureListener, mTouch.x = ex; mTouch.y = ey; - if (event.getPointerCount() == 2) { + if (!ENABLE_COMPARISON || event.getPointerCount() == 2) { float scaleFactor = MasterImage.getImage().getScaleFactor(); if (scaleFactor >= 1) { float translateX = (mTouch.x - mTouchDown.x) / scaleFactor; @@ -657,7 +659,7 @@ public class ImageShow extends View implements OnGestureListener, if (endEvent.getPointerCount() == 2) { return false; } - if ((!mActivity.isShowingHistoryPanel() && startEvent.getX() > endEvent.getX()) + if (ENABLE_HISTORY_SWAP && (!mActivity.isShowingHistoryPanel() && startEvent.getX() > endEvent.getX()) || (mActivity.isShowingHistoryPanel() && endEvent.getX() > startEvent.getX())) { if (!mTouchShowOriginal || (mTouchShowOriginal && |