From a38e8cb57b697d63360696ed6badc93dd7a35130 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 24 Mar 2009 03:25:38 +0000
Subject: [PATCH]   Slight updates to get to 2.6.1 - including making the
 swipes far more lenient, and fixing back button behavior.

---
 AndroidManifest.xml                                      | 4 ++--
 res/values/arrays.xml                                    | 2 +-
 src/com/timsu/astrid/activities/TaskList.java            | 6 +++---
 src/com/timsu/astrid/activities/TaskListSubActivity.java | 3 +++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dbef69cd8..5ef2b3f24 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="98"
-      android:versionName="2.6.0">
+      android:versionCode="99"
+      android:versionName="2.6.1">
       
     <meta-data android:name="com.a0soft.gphone.aTrackDog.webURL"
                android:value="http://www.weloveastrid.com" />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index be075a405..e3a9e5a6d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -63,7 +63,7 @@
         <item>Why postpone when you can um... not postpone!</item>
         <item>You\'ll finish this eventually, I presume?</item>
         <item>I think you\'re really great! How about not putting this off?</item>
-        <item>Every time you do that, you put yourself at risk!</item>
+        <item>Will you be able to achieve your goals if you do that?</item>
         <item>Postpone, postpone, postpone. When will you change!</item>
         <item>I\'ve had enough with your excuses! Just do it already!</item>
         <item>Didn\'t you make that excuse last time?</item>
diff --git a/src/com/timsu/astrid/activities/TaskList.java b/src/com/timsu/astrid/activities/TaskList.java
index e7ca76445..f7f970b1c 100644
--- a/src/com/timsu/astrid/activities/TaskList.java
+++ b/src/com/timsu/astrid/activities/TaskList.java
@@ -71,10 +71,10 @@ public class TaskList extends Activity {
     private static final int FLING_DIST_THRESHOLD = 120;
 
     /** Maximum distance in the other axis for a fling */
-    private static final int MAX_FLING_OTHER_AXIS = 150;
+    private static final int MAX_FLING_OTHER_AXIS = 300;
 
     /** Minimum velocity a fling must have to trigger motion */
-	private static final int FLING_VEL_THRESHOLD = 300;
+	private static final int FLING_VEL_THRESHOLD = 200;
 
 	// view components
 	private ViewFlipper viewFlipper;
@@ -184,7 +184,7 @@ public class TaskList extends Activity {
                     return false;
 
                 Log.i("astrid", "Got fling. X: " + (e2.getX() - e1.getX()) +
-                        ", vel: " + velocityX);
+                        ", vel: " + velocityX + " Y: " + (e2.getY() - e1.getY()));
 
                 // flick R to L
                 if(e1.getX() - e2.getX() > FLING_DIST_THRESHOLD &&
diff --git a/src/com/timsu/astrid/activities/TaskListSubActivity.java b/src/com/timsu/astrid/activities/TaskListSubActivity.java
index ff3d40569..a64394601 100644
--- a/src/com/timsu/astrid/activities/TaskListSubActivity.java
+++ b/src/com/timsu/astrid/activities/TaskListSubActivity.java
@@ -795,6 +795,9 @@ public class TaskListSubActivity extends SubActivity {
     		if(context.filterTag != null) {
     			showTagsView();
     			return true;
+    		} else {
+    		    // close the app
+    		    getParent().finish();
     		}
     	}