summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriele M <moto.falcon.git@gmail.com>2017-03-11 20:07:59 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-27 00:41:42 +0100
commitef0ff9cd24700d5f0c6e16a648e95a9832956a8d (patch)
tree67442f27a155ee79c51245220719c2aefda4447c
parente6387ff03b18ed93b53b6357cf34ccf8c201efae (diff)
downloadandroid_packages_apps_Snap-ef0ff9cd24700d5f0c6e16a648e95a9832956a8d.zip
android_packages_apps_Snap-ef0ff9cd24700d5f0c6e16a648e95a9832956a8d.tar.gz
android_packages_apps_Snap-ef0ff9cd24700d5f0c6e16a648e95a9832956a8d.tar.bz2
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.java4
-rw-r--r--src/com/android/camera/ui/FilmStripView.java4
2 files changed, 0 insertions, 8 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 48d972f..81177ba 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 e6e00ad..6a76786 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;