diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2017-03-11 20:07:59 +0100 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2017-04-04 16:19:56 +0000 |
| commit | 9e8d9195a2ca900e15cc6eadc7a2864306b2b75c (patch) | |
| tree | 6d4d048708a6b3bb7677e4c88f25eb78103c006a | |
| parent | b9da2b071426aadfd6ca6fdaf72ca742f594537f (diff) | |
| download | android_packages_apps_Snap-9e8d9195a2ca900e15cc6eadc7a2864306b2b75c.tar.gz android_packages_apps_Snap-9e8d9195a2ca900e15cc6eadc7a2864306b2b75c.tar.bz2 android_packages_apps_Snap-9e8d9195a2ca900e15cc6eadc7a2864306b2b75c.zip | |
Never ignore finger swipes in gallery mode
Under certain conditions finger swipes are ignored.
Steps to reproduce the bug:
- Open left menu
- Close menu choosing an option or tapping out of the preview
- Tap preview of last picture in bottom left corner
Swipes in the gallry should now be ignored until a right to left
swipe is performed in the preview.
Change-Id: I3928d84360266cca368265553a037192aa5d6780
| -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 26e34ea48..d6ce6bf23 100644 --- a/src/com/android/camera/PreviewGestures.java +++ b/src/com/android/camera/PreviewGestures.java @@ -281,10 +281,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 bd57317ea..016ba5963 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -2897,8 +2897,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; @@ -2971,8 +2969,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; |