Add filter adapter timer icon, add filter ctor

src/main/java/com/todoroo/astrid/activity/TaskListFragment.java

@@ -314,7 +314,7 @@ public class TaskListFragment extends InjectingListFragment implements
                                                                         query + "%"
                                                         )
                                         )
-                                ), null);
+                                ));
 
                 ((TaskListActivity) getActivity()).onFilterItemClicked(savedFilter);
                 MenuItemCompat.collapseActionView(item);

src/main/java/com/todoroo/astrid/api/Filter.java

@@ -63,6 +63,10 @@ public class Filter extends FilterListItem {
      */
     public ContentValues valuesForNewTasks = null;
 
+    public Filter(String listingTitle, QueryTemplate sqlQuery) {
+        this(listingTitle, sqlQuery, null);
+    }
+
     /**
      * Utility constructor for creating a Filter object
      * @param listingTitle

src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java

@@ -83,8 +83,7 @@ public final class BuiltInFilterExposer {
      */
     public static Filter getMyTasksFilter(Resources r) {
         return new Filter(r.getString(R.string.BFE_Active),
-                new QueryTemplate().where(TaskCriteria.activeAndVisible()),
-                null);
+                new QueryTemplate().where(TaskCriteria.activeAndVisible()));
     }
 
     public static Filter getTodayFilter(Resources r) {
@@ -103,8 +102,7 @@ public final class BuiltInFilterExposer {
         return new Filter(r.getString(R.string.BFE_Recent),
                 new QueryTemplate().where(
                         TaskCriteria.notDeleted()).orderBy(
-                        Order.desc(Task.MODIFICATION_DATE)).limit(15),
-                null);
+                        Order.desc(Task.MODIFICATION_DATE)).limit(15));
     }
 
     public static Filter getUncategorizedFilter(Resources r) {
@@ -113,8 +111,7 @@ public final class BuiltInFilterExposer {
                         Criterion.not(Task.UUID.in(Query.select(TaskToTagMetadata.TASK_UUID).from(Metadata.TABLE)
                                 .where(Criterion.and(MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY), Metadata.DELETION_DATE.eq(0))))),
                         TaskCriteria.isActive(),
-                        TaskCriteria.isVisible())),
-                null);
+                        TaskCriteria.isVisible())));
     }
 
     public static boolean isInbox(Context context, Filter filter) {

src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java

@@ -5,7 +5,6 @@
  */
 package com.todoroo.astrid.timers;
 
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.res.Resources;
 
@@ -52,10 +51,8 @@ public final class TimerFilterExposer {
 
     public static Filter createFilter(Context context) {
         Resources r = context.getResources();
-        ContentValues values = new ContentValues();
-        values.put(Task.TIMER_START.name, Filter.VALUE_NOW);
-        return new Filter(r.getString(R.string.TFE_workingOn),
-                new QueryTemplate().where(Task.TIMER_START.gt(0)),
-                values);
+        Filter filter = new Filter(r.getString(R.string.TFE_workingOn), new QueryTemplate().where(Task.TIMER_START.gt(0)));
+        filter.icon = R.drawable.ic_timer_24dp;
+        return filter;
     }
 }