From 1193108523b925a99e0a821c9242b95ce3a30346 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 5 Oct 2010 17:37:39 -0700
Subject: [PATCH] If you drag and swipe, the drag overrules

---
 astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
index 45c2a1722..62ab25e94 100644
--- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
+++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
@@ -262,12 +262,12 @@ public class TouchListView extends ListView {
 									Rect r = mTempRect;
 									mDragView.getDrawingRect(r);
 									stopDragging();
-									if (ev.getX() > mDragStartX + 20) {
+									if (mDragPos == mFirstDragPos && ev.getX() > mDragStartX + 20) {
 											if (mSwipeListener!= null) {
 													mSwipeListener.swipeRight(mFirstDragPos);
 											}
 											unExpandViews(true);
-									} else if (ev.getX() < mDragStartX - 20) {
+									} else if (mDragPos == mFirstDragPos && ev.getX() < mDragStartX - 20) {
     									    if (mSwipeListener!= null) {
     									        mSwipeListener.swipeLeft(mFirstDragPos);
     									    }