Merge with 2.9.2

------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="119" android:versionName="2.9.1">
+      android:versionCode="120" android:versionName="2.9.2">
       
     <!-- ============================ Metadata ============================ -->   
       

src/com/timsu/astrid/activities/TaskListAdapter.java

@@ -406,7 +406,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
             if(cachedResult == null) {
                 Integer elapsed = task.getElapsedSeconds();
                 if(task.getTimerStart() != null)
-                    elapsed += ((System.currentTimeMillis() - task.getTimerStart().getTime())/1000);
+                    elapsed += (int)((System.currentTimeMillis() - task.getTimerStart().getTime())/1000L);
                 Integer estimated = task.getEstimatedSeconds();
                 StringBuilder label = new StringBuilder();
                 if(estimated > 0) {

src/com/timsu/astrid/activities/TaskListSubActivity.java

@@ -38,15 +38,19 @@ import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.InputType;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.view.View.OnCreateContextMenuListener;
+import android.view.View.OnTouchListener;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -295,6 +299,18 @@ public class TaskListSubActivity extends SubActivity {
                 onCreateMoreOptionsMenu(menu);
             }
         });
+
+        // disable add text input box until user requests it
+        final EditText quickAdd = (EditText)findViewById(R.id.quickAddText);
+        final int inputType = quickAdd.getInputType();
+        quickAdd.setInputType(InputType.TYPE_NULL);
+        quickAdd.setOnTouchListener(new OnTouchListener() {
+            public boolean onTouch(View v, MotionEvent event) {
+                quickAdd.setInputType(inputType);
+                quickAdd.setOnTouchListener(null);
+                return false;
+            }
+        });
     }
 
     /**

src/com/timsu/astrid/data/task/TaskController.java

@@ -511,17 +511,15 @@ public class TaskController extends AbstractController {
 
     public ArrayList<TaskModelForWidget> getTasksForWidget(String limit) {
 
-    	Cursor cursor = database.query(TASK_TABLE_NAME, TaskModelForList.FIELD_LIST,
+    	Cursor cursor = database.query(TASK_TABLE_NAME, TaskModelForWidget.FIELD_LIST,
     	        AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
                 AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
                 AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
                 System.currentTimeMillis() + ")", null, null, null,
-                AbstractTaskModel.IMPORTANCE + " * " + (3 * 24 * 3600 * 1000L) +
-                    " + CASE WHEN MAX(" + AbstractTaskModel.DEFINITE_DUE_DATE + "," +
-                    AbstractTaskModel.PREFERRED_DUE_DATE + ") = 0 THEN " +
-                    (System.currentTimeMillis() + 7 * 24 * 3600 * 1000L) +
-                    " ELSE MIN(" + AbstractTaskModel.DEFINITE_DUE_DATE + "," +
-                    AbstractTaskModel.PREFERRED_DUE_DATE + ") END", limit);
+                AbstractTaskModel.IMPORTANCE + " * " + (5 * 24 * 3600 * 1000L) +
+                    " + CASE WHEN MAX(pdd, ddd) = 0 THEN " +
+                    (System.currentTimeMillis() + (7 * 24 * 3600 * 1000L)) +
+                    " ELSE (CASE WHEN pdd = 0 THEN ddd ELSE pdd END) END ASC", limit);
 
     	try {
             ArrayList<TaskModelForWidget> list = new ArrayList<TaskModelForWidget>();

src/com/timsu/astrid/data/task/TaskModelForWidget.java

@@ -36,7 +36,9 @@ public class TaskModelForWidget extends AbstractTaskModel {
         NAME,
         IMPORTANCE,
         PREFERRED_DUE_DATE,
-        DEFINITE_DUE_DATE
+        DEFINITE_DUE_DATE,
+        "COALESCE(" + PREFERRED_DUE_DATE + ", 0) as pdd",
+        "COALESCE(" + DEFINITE_DUE_DATE + ", 0) as ddd"
     };
 
     // --- constructors