diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/ui/SwipeableListView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java index 39429d03b..6adad0475 100644 --- a/src/com/android/mail/ui/SwipeableListView.java +++ b/src/com/android/mail/ui/SwipeableListView.java @@ -170,14 +170,15 @@ public class SwipeableListView extends ListView implements Callback, OnScrollLis if (mScrolling) { return super.onInterceptTouchEvent(ev); } else { - return (!mPreventSwipesEntirely && mSwipeHelper.onInterceptTouchEvent(ev)) - || super.onInterceptTouchEvent(ev); + return (mEnableSwipe && !mPreventSwipesEntirely + && mSwipeHelper.onInterceptTouchEvent(ev)) || super.onInterceptTouchEvent(ev); } } @Override public boolean onTouchEvent(MotionEvent ev) { - return (!mPreventSwipesEntirely && mSwipeHelper.onTouchEvent(ev)) || super.onTouchEvent(ev); + return (mEnableSwipe && !mPreventSwipesEntirely + && mSwipeHelper.onTouchEvent(ev)) || super.onTouchEvent(ev); } @Override |