diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2015-04-10 22:26:01 +0200 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-18 14:13:46 -0700 |
| commit | 03534a6a8fc9775636794244a3ef571127417430 (patch) | |
| tree | 6c3cbf6cbfa2e6d597b15b2767ea6d8933ff314a /src | |
| parent | f84ec950c0a31076222374f49672c831fbcd34a1 (diff) | |
| download | android_packages_apps_UnifiedEmail-03534a6a8fc9775636794244a3ef571127417430.tar.gz android_packages_apps_UnifiedEmail-03534a6a8fc9775636794244a3ef571127417430.tar.bz2 android_packages_apps_UnifiedEmail-03534a6a8fc9775636794244a3ef571127417430.zip | |
unified-email: respect swipe user setting
Don't start swipe if the user has disabled it by settings
Change-Id: I79b2d694219dc6497fbe85d7608bd36ee48a42d7
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
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 |