diff options
| -rw-r--r-- | src/com/android/camera/PreviewGestures.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java index 48d972f7c..81177baa0 100644 --- a/src/com/android/camera/PreviewGestures.java +++ b/src/com/android/camera/PreviewGestures.java @@ -265,10 +265,6 @@ public class PreviewGestures return true; } - public boolean waitUntilNextDown() { - return waitUntilNextDown; - } - private MotionEvent makeCancelEvent(MotionEvent m) { MotionEvent c = MotionEvent.obtain(m); c.setAction(MotionEvent.ACTION_CANCEL); diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index e6e00ad56..6a767862f 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -2825,8 +2825,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { @Override public boolean onScroll(float x, float y, float dx, float dy) { - if (mPreviewGestures != null && mPreviewGestures.waitUntilNextDown()) - return false; ViewItem currItem = mViewItem[mCurrentItem]; if (currItem == null) { return false; @@ -2892,8 +2890,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { @Override public boolean onFling(float velocityX, float velocityY) { - if (mPreviewGestures != null && mPreviewGestures.waitUntilNextDown()) - return false; final ViewItem currItem = mViewItem[mCurrentItem]; if (currItem == null) { return false; |