Clarified Importance string in custom filter, fix for not quick-adding tasks.

astrid/res/values/strings-filters.xml

@@ -81,7 +81,7 @@
     </string-array>
     
     <!-- Criteria: importance - display text -->
-    <string name="CFC_importance_text">Importance: ?</string>
+    <string name="CFC_importance_text">Importance at least ?</string>
     <!-- Criteria: importance - name of criteria -->
     <string name="CFC_importance_name">Importance...</string>        
     

astrid/src/com/todoroo/astrid/activity/FilterListActivity.java

@@ -5,8 +5,8 @@ package com.todoroo.astrid.activity;
 
 import android.app.AlertDialog;
 import android.app.ExpandableListActivity;
-import android.app.PendingIntent.CanceledException;
 import android.app.SearchManager;
+import android.app.PendingIntent.CanceledException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -18,20 +18,20 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
-import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
+import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;

astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -27,15 +27,15 @@ import java.util.List;
 
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
-import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.TabActivity;
+import android.app.DatePickerDialog.OnDateSetListener;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.format.DateUtils;
@@ -45,7 +45,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -60,6 +59,7 @@ import android.widget.TabHost;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
+import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -322,7 +322,7 @@ public final class TaskEditActivity extends TabActivity {
             ContentValues values = null;
             if(valuesAsString != null)
                 values = AndroidUtilities.contentValuesFromSerializedString(valuesAsString);
-            model = TaskListActivity.createWithValues(values, taskService, metadataService);
+            model = TaskListActivity.createWithValues(values, null, taskService, metadataService);
         }
         if(model.getValue(Task.TITLE).length() == 0)
             FlurryAgent.onEvent("create-task");

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -2,9 +2,9 @@ package com.todoroo.astrid.activity;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicReference;
 
 import android.app.AlertDialog;
@@ -25,26 +25,26 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -631,8 +631,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
     protected Task quickAddTask(String title, boolean selectNewTask) {
         try {
             Task task = createWithValues(filter.valuesForNewTasks,
-                    taskService, metadataService);
+                    title.trim(), taskService, metadataService);
-            task.setValue(Task.TITLE, title.trim());
 
             TextView quickAdd = (TextView)findViewById(R.id.quickAddText);
             quickAdd.setText(""); //$NON-NLS-1$
@@ -652,13 +651,16 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
     /**
      * Create task from the given content values, saving it.
      * @param values
+     * @param title
      * @param taskService
      * @param metadataService
      * @return
      */
-    public static Task createWithValues(ContentValues values, TaskService taskService,
+    public static Task createWithValues(ContentValues values, String title, TaskService taskService,
             MetadataService metadataService) {
         Task task = new Task();
+        if(title != null)
+            task.setValue(Task.TITLE, title);
         ContentValues forMetadata = null;
         if(values != null && values.size() > 0) {
             ContentValues forTask = new ContentValues();