summaryrefslogtreecommitdiffstats
path: root/photoviewer/src/com/android/ex/photo/views/PhotoView.java
diff options
context:
space:
mode:
Diffstat (limited to 'photoviewer/src/com/android/ex/photo/views/PhotoView.java')
-rw-r--r--photoviewer/src/com/android/ex/photo/views/PhotoView.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/photoviewer/src/com/android/ex/photo/views/PhotoView.java b/photoviewer/src/com/android/ex/photo/views/PhotoView.java
index e767cba..4dd0a08 100644
--- a/photoviewer/src/com/android/ex/photo/views/PhotoView.java
+++ b/photoviewer/src/com/android/ex/photo/views/PhotoView.java
@@ -29,7 +29,6 @@ import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.BitmapDrawable;
import android.util.AttributeSet;
-import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import android.view.View;
@@ -131,8 +130,6 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener
private float mMaxScale;
/** When {@code true}, prevents scale end gesture from falsely triggering a fling. */
private boolean mFlingDebounce;
- /** When {@code true}, prevents scale end gesture from falsely triggering a scroll. */
- private boolean mScrollDebounce;
// To support translation [i.e. panning]
/** Runnable that can move the image */
@@ -244,10 +241,7 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
if (mTransformsEnabled) {
- if (!mScrollDebounce) {
- translate(-distanceX, -distanceY);
- }
- mScrollDebounce = false;
+ translate(-distanceX, -distanceY);
}
return true;
}
@@ -299,7 +293,6 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener
resetTransformations();
}
mFlingDebounce = true;
- mScrollDebounce = true;
}
@Override