From e99e52b64f809159446c5e318e7f7c1382ac419a Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 23 Jul 2010 19:22:06 -0700
Subject: [PATCH] Locale plugin.

---
 astrid/.classpath                             |   2 +-
 .../com/todoroo/astrid/api/Filter.java        |   3 +-
 astrid/astrid.launch                          |   5 +-
 .../com/todoroo/andlib/sql/Functions.java     |   7 +
 astrid/lib/locale_platform.jar                | Bin 3550 -> 9415 bytes
 .../todoroo/astrid/backup/BackupService.java  |  14 +-
 .../astrid/core/CoreFilterExposer.java        |   8 +-
 .../astrid/locale/LocaleEditAlerts.java       | 394 ++++++++++++------
 .../todoroo/astrid/locale/LocaleReceiver.java | 102 +++--
 .../astrid/rmilk/MilkFilterExposer.java       |   3 +-
 .../astrid/rmilk/data/MilkDataService.java    |   3 +-
 .../com/todoroo/astrid/tags/TagService.java   |   3 +-
 astrid/res/drawable/filter_selected_icon.png  | Bin 0 -> 328 bytes
 astrid/res/layout/filter_adapter_row.xml      |  52 +++
 astrid/res/layout/locale_edit_alerts.xml      |  52 ++-
 .../res/layout/locale_ellipsizing_title.xml   |  19 -
 astrid/res/layout/task_adapter_row.xml        |   6 -
 astrid/res/menu/locale_edit_alerts.xml        |  17 -
 astrid/res/values/strings-filters.xml         |   2 +-
 astrid/res/values/strings-locale.xml          |  38 +-
 astrid/res/values/styles-3.0.xml              |  17 +-
 .../astrid/activity/FilterListActivity.java   |  81 +---
 .../todoroo/astrid/adapter/FilterAdapter.java | 299 ++++++++-----
 .../src/com/todoroo/astrid/dao/TaskDao.java   |  19 +-
 .../service/Astrid2To3UpgradeHelper.java      |  24 +-
 .../astrid/service/StartupService.java        |   6 +-
 .../todoroo/astrid/utility/Preferences.java   |  50 ++-
 .../com/todoroo/astrid/dao/TaskDaoTests.java  |   8 +-
 28 files changed, 762 insertions(+), 472 deletions(-)
 create mode 100644 astrid/res/drawable/filter_selected_icon.png
 create mode 100644 astrid/res/layout/filter_adapter_row.xml
 delete mode 100644 astrid/res/layout/locale_ellipsizing_title.xml
 delete mode 100644 astrid/res/menu/locale_edit_alerts.xml

diff --git a/astrid/.classpath b/astrid/.classpath
index 17e78b6c2..bc28b5eed 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src-legacy"/>
 	<classpathentry kind="src" path="api-src"/>
 	<classpathentry kind="src" path="common-src"/>
-	<classpathentry excluding="com/todoroo/astrid/rmilk/EditOperationExposer.java|com/todoroo/astrid/rmilk/MilkEditActivity.java|com/todoroo/astrid/rmilk/StartupReceiver.java|com/todoroo/astrid/backup/BackupService.java|com/todoroo/astrid/backup/TasksXmlExporter.java|com/todoroo/astrid/backup/TasksXmlImporter.java" kind="src" path="plugin-src"/>
+	<classpathentry excluding="com/todoroo/astrid/rmilk/EditOperationExposer.java|com/todoroo/astrid/rmilk/MilkEditActivity.java|com/todoroo/astrid/rmilk/StartupReceiver.java|com/todoroo/astrid/backup/TasksXmlExporter.java|com/todoroo/astrid/backup/TasksXmlImporter.java" kind="src" path="plugin-src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
diff --git a/astrid/api-src/com/todoroo/astrid/api/Filter.java b/astrid/api-src/com/todoroo/astrid/api/Filter.java
index 9c8c258c8..83083c6b5 100644
--- a/astrid/api-src/com/todoroo/astrid/api/Filter.java
+++ b/astrid/api-src/com/todoroo/astrid/api/Filter.java
@@ -79,7 +79,8 @@ public final class Filter extends FilterListItem {
             QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
         this.listingTitle = listingTitle;
         this.title = title;
-        this.sqlQuery = sqlQuery.toString();
+        if(sqlQuery != null)
+            this.sqlQuery = sqlQuery.toString();
         this.valuesForNewTasks = valuesForNewTasks;
     }
 
diff --git a/astrid/astrid.launch b/astrid/astrid.launch
index 0a7cd7209..72aa24a68 100644
--- a/astrid/astrid.launch
+++ b/astrid/astrid.launch
@@ -4,8 +4,9 @@
 <booleanAttribute key="ch.zork.quicklaunch" value="true"/>
 <stringAttribute key="ch.zork.quicklaunch.icon" value="14.gif"/>
 <intAttribute key="ch.zork.quicklaunch.index" value="0"/>
-<stringAttribute key="ch.zork.quicklaunch.mode" value="run"/>
+<stringAttribute key="ch.zork.quicklaunch.mode" value="debug"/>
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
+<stringAttribute key="com.android.ide.eclipse.adt.avd" value="evo-8-google"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value="-scale 0.7"/>
 <intAttribute key="com.android.ide.eclipse.adt.delay" value="0"/>
 <booleanAttribute key="com.android.ide.eclipse.adt.nobootanim" value="true"/>
@@ -14,9 +15,11 @@
 <booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/astrid"/>
+<listEntry value="/astrid/AndroidManifest.xml"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
diff --git a/astrid/common-src/com/todoroo/andlib/sql/Functions.java b/astrid/common-src/com/todoroo/andlib/sql/Functions.java
index ca56da772..4099d3c72 100644
--- a/astrid/common-src/com/todoroo/andlib/sql/Functions.java
+++ b/astrid/common-src/com/todoroo/andlib/sql/Functions.java
@@ -18,4 +18,11 @@ public final class Functions {
         return new Field("UPPER(" + title.toString() + ")");
     }
 
+    /**
+     * @return SQL now (in milliseconds)
+     */
+    public static Field now() {
+        return new Field("(strftime('%s','now')*1000)");
+    }
+
 }
diff --git a/astrid/lib/locale_platform.jar b/astrid/lib/locale_platform.jar
index a26346f2855a3c2c33c6ee98e776ed83dca8310e..cd7183aa04cd194d58b37a79d935ec813dca48af 100644
GIT binary patch
literal 9415
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

literal 3550
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
bRgq!-r8-=XmV7<HKW}n^<ld6UM0xrTO{uyc

diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
index f693e6b89..36d48f794 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.FileFilter;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Date;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -12,9 +11,6 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
-import android.util.Log;
-
-import com.timsu.astrid.R;
 
 /**
  * Inspired heavily by SynchronizationService
@@ -55,7 +51,7 @@ public class BackupService extends Service {
     }
 
     private void startBackup(Context ctx) {
-        if (ctx == null || ctx.getResources() == null) {
+        /*if (ctx == null || ctx.getResources() == null) {
             return;
         }
         try {
@@ -84,11 +80,11 @@ public class BackupService extends Service {
                         ctx.getString(R.string.BPr_backup_desc_failure,
                                 e.toString()));
             }
-        }
+        }*/
     }
 
     public static void scheduleService(Context ctx) {
-        AlarmManager am = (AlarmManager) ctx.getSystemService(Context.ALARM_SERVICE);
+        /*AlarmManager am = (AlarmManager) ctx.getSystemService(Context.ALARM_SERVICE);
         PendingIntent pendingIntent = PendingIntent.getService(ctx, 0,
                 createAlarmIntent(ctx), PendingIntent.FLAG_UPDATE_CURRENT);
         am.cancel(pendingIntent);
@@ -96,7 +92,7 @@ public class BackupService extends Service {
             return;
         }
         am.setInexactRepeating(AlarmManager.RTC, System.currentTimeMillis() + BACKUP_OFFSET,
-                BACKUP_INTERVAL, pendingIntent);
+                BACKUP_INTERVAL, pendingIntent);*/
     }
 
     public static void unscheduleService(Context ctx) {
@@ -148,7 +144,7 @@ public class BackupService extends Service {
 
     private BackupDirectorySetting backupDirectorySetting = new BackupDirectorySetting() {
         public File getBackupDirectory() {
-            return TasksXmlExporter.getExportDirectory();
+            return null; //TasksXmlExporter.getExportDirectory();
         }
     };
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
index 2cf3e9457..0521feef3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
@@ -50,7 +50,7 @@ public final class CoreFilterExposer extends BroadcastReceiver {
         Filter alphabetical = new Filter(r.getString(R.string.BFE_Alphabetical),
                 r.getString(R.string.BFE_Alphabetical),
                 new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
-                        TaskCriteria.isVisible(DateUtilities.now()))).
+                        TaskCriteria.isVisible())).
                         orderBy(Order.asc(Task.TITLE)),
                 null);
         alphabetical.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_alpha)).getBitmap();
@@ -66,7 +66,7 @@ public final class CoreFilterExposer extends BroadcastReceiver {
         Filter hidden = new Filter(r.getString(R.string.BFE_Hidden),
                 r.getString(R.string.BFE_Hidden),
                 new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
-                        Criterion.not(TaskCriteria.isVisible(DateUtilities.now())))).
+                        Criterion.not(TaskCriteria.isVisible()))).
                         orderBy(Order.asc(Task.HIDE_UNTIL)),
                 hiddenValues);
         hidden.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_clouds)).getBitmap();
@@ -74,7 +74,7 @@ public final class CoreFilterExposer extends BroadcastReceiver {
         ContentValues completedValues = new ContentValues();
         hiddenValues.put(Task.COMPLETION_DATE.name, DateUtilities.now());
         Filter completed = new Filter(r.getString(R.string.BFE_Completed), r.getString(R.string.BFE_Completed),
-                new QueryTemplate().where(Criterion.and(TaskCriteria.completedBefore(DateUtilities.now()),
+                new QueryTemplate().where(Criterion.and(TaskCriteria.completed(),
                         Criterion.not(TaskCriteria.isDeleted()))). orderBy(Order.desc(Task.COMPLETION_DATE)),
                 completedValues);
         completed.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_check)).getBitmap();
@@ -109,7 +109,7 @@ public final class CoreFilterExposer extends BroadcastReceiver {
     public static Filter buildInboxFilter(Resources r) {
         Filter inbox = new Filter(r.getString(R.string.BFE_Active), r.getString(R.string.BFE_Active_title),
                 new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
-                        TaskCriteria.isVisible(DateUtilities.now()))),
+                        TaskCriteria.isVisible())),
                 null);
         inbox.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_home)).getBitmap();
         return inbox;
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index 7b51c70cc..a4bc486be 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -1,104 +1,270 @@
 package com.todoroo.astrid.locale;
 
-import java.util.LinkedList;
-
 import android.app.Activity;
+import android.app.ExpandableListActivity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
+import android.widget.ExpandableListView;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
-import com.timsu.astrid.data.tag.TagController;
-import com.timsu.astrid.data.tag.TagModelForView;
+import com.todoroo.astrid.adapter.FilterAdapter;
+import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.utility.Constants;
+import com.twofortyfouram.SharedResources;
 
 /**
  * Activity to edit alerts from Locale
  *
- * @author timsu
+ * @author Tim Su <tim@todoroo.com>
  *
  */
-public final class LocaleEditAlerts extends Activity {
+public final class LocaleEditAlerts extends ExpandableListActivity {
+
+    // --- locale constants
 
     /** value for action type for tag alert */
     @SuppressWarnings("nls")
-    public static final String ACTION_LOCALE_ALERT = "com.timsu.astrid.action.LOCALE_ALERT";
+    public static final String ACTION_LOCALE_ALERT = "com.todoroo.astrid.action.LOCALE_ALERT";
 
-    /** key name for tag id/name in bundle */
+    /** key name for filter title in bundle */
     @SuppressWarnings("nls")
-    public static final String KEY_TAG_ID = "tag";
+    public static final String KEY_FILTER_TITLE = "title";
 
+    /** key name for filter SQL in bundle */
     @SuppressWarnings("nls")
-    public static final String KEY_TAG_NAME = "name";
+    public static final String KEY_SQL = "sql";
 
-    private LinkedList<TagModelForView> tags = null;
-    private String[] tagNames = null;
+    /** key name for interval (integer, # of seconds) */
+    @SuppressWarnings("nls")
+    public static final String KEY_INTERVAL = "interval";
+
+    // --- activity constants
+
+    /**
+     * Indices for interval setting
+     */
+    public static final int INTERVAL_ONE_HOUR = 0;
+    public static final int INTERVAL_SIX_HOURS = 1;
+    public static final int INTERVAL_TWELVE_HOURS = 2;
+    public static final int INTERVAL_ONE_DAY = 3;
+    public static final int INTERVAL_THREE_DAYS = 4;
+    public static final int INTERVAL_ONE_WEEK = 5;
+
+    /**
+     * Intervals in seconds
+     */
+    public static final int[] INTERVALS = new int[] {
+        3600, 6 * 3600, 12 * 3600, 24 * 3600, 3 * 24 * 3600, 7 * 24 * 3600
+    };
+
+    /**
+     * Menu ID of the save item.
+     */
+    private static final int MENU_SAVE = 1;
+
+    /**
+     * Menu ID of the don't save item.
+     */
+    private static final int MENU_DONT_SAVE = 2;
+
+    // --- implementation
+
+    FilterAdapter adapter = null;
+    Spinner interval = null;
+
+    /**
+     * Flag boolean that can only be set to true via the "Don't Save" menu item in {@link #onMenuItemSelected(int, MenuItem)}. If
+     * true, then this {@code Activity} should return {@link Activity#RESULT_CANCELED} in {@link #finish()}.
+     * <p>
+     * There is no need to save/restore this field's state when the {@code Activity} is paused.
+     */
+    private boolean isCancelled = false;
 
 	/** Called when the activity is first created. */
 	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
+	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
 		setContentView(R.layout.locale_edit_alerts);
 
-		// Set up the breadcrumbs in the title bar
-		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.locale_ellipsizing_title);
-
-		String breadcrumbString = getIntent().getStringExtra(com.twofortyfouram.Intent.EXTRA_STRING_BREADCRUMB);
-		if (breadcrumbString == null)
-			breadcrumbString = getString(R.string.locale_edit_alerts_title);
-		else
-			breadcrumbString = breadcrumbString + com.twofortyfouram.Intent.BREADCRUMB_SEPARATOR + getString(R.string.locale_edit_alerts_title);
+		/*
+         * Locale guarantees that the breadcrumb string will be present, but checking for null anyway makes your Activity more
+         * robust and re-usable
+         */
+        final String breadcrumbString = getIntent().getStringExtra(com.twofortyfouram.Intent.EXTRA_STRING_BREADCRUMB);
+        if (breadcrumbString != null)
+            setTitle(String.format("%s%s%s", breadcrumbString, com.twofortyfouram.Intent.BREADCRUMB_SEPARATOR, //$NON-NLS-1$
+                    getString(R.string.locale_edit_alerts_title)));
 
-		((TextView) findViewById(R.id.locale_ellipsizing_title_text)).setText(breadcrumbString);
-		setTitle(breadcrumbString);
+        /*
+         * Load the Locale background frame from Locale
+         */
+        ((LinearLayout) findViewById(R.id.frame)).setBackgroundDrawable(
+                SharedResources.getDrawableResource(getPackageManager(),
+                        SharedResources.DRAWABLE_LOCALE_BORDER));
+
+        // set up UI components
+        interval = (Spinner) findViewById(R.id.intervalSpinner);
+        interval.setSelection(INTERVAL_ONE_DAY);
+        String selectionToMatch = null;
+
+        try {
+            /*
+             * if savedInstanceState == null, then we are entering the Activity directly from Locale and we need to check whether the
+             * Intent has forwarded a Bundle extra (e.g. whether we editing an old setting or creating a new one)
+             */
+            if (savedInstanceState == null)
+            {
+                final Bundle forwardedBundle = getIntent().getBundleExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE);
+
+                /*
+                 * the forwardedBundle would be null if this was a new setting
+                 */
+                if (forwardedBundle != null)
+                {
+                    final int intervalValue = getIntent().getIntExtra(KEY_INTERVAL, INTERVALS[interval.getSelectedItemPosition()]);
+                    for(int i = 0; i < INTERVALS.length; i++) {
+                        if(intervalValue == INTERVALS[i]) {
+                            interval.setSelection(i);
+                            break;
+                        }
+                    }
+                    selectionToMatch = getIntent().getStringExtra(KEY_SQL);
+                }
+            }
+        } catch (Exception e) {
+            selectionToMatch = null;
+            Log.e("astrid-locale", "Error loading bundle", e); //$NON-NLS-1$ //$NON-NLS-2$
+        }
 
-		final Spinner tagSpinner = (Spinner) findViewById(R.id.spinner);
+        // if we match a selection, make it selected
+        final String finalSelection = selectionToMatch;
+        adapter = new FilterAdapter(this, getExpandableListView(), R.layout.filter_adapter_row) {
+            @Override
+            public void onReceiveFilter(FilterListItem item) {
+                if(finalSelection != null && item instanceof Filter &&
+                        finalSelection.equals(((Filter)item).sqlQuery))
+                    adapter.setSelection(item);
+            }
+        };
+        adapter.filterStyle = R.style.TextAppearance_LEA_Filter;
+        adapter.headerStyle = R.style.TextAppearance_LEA_Header;
+        adapter.categoryStyle = R.style.TextAppearance_LEA_Category;
+        setListAdapter(adapter);
+	}
 
-		TagController tagController = new TagController(this);
-		tagController.open();
-		tags = tagController.getAllTags();
-		tagController.close();
+    @Override
+    public boolean onChildClick(ExpandableListView parent, View v,
+            int groupPosition, int childPosition, long id) {
+        FilterListItem item = (FilterListItem) adapter.getChild(groupPosition,
+                childPosition);
+        if(item instanceof Filter) {
+            adapter.setSelection(item);
+        }
+        return true;
+    }
 
-		tagNames = new String[tags.size()];
-		for(int i = 0; i < tags.size(); i++)
-		    tagNames[i] = tags.get(i).getName();
+    @Override
+    public void onGroupExpand(int groupPosition) {
+        FilterListItem item = (FilterListItem) adapter.getGroup(groupPosition);
+        if(item instanceof Filter) {
+            adapter.setSelection(item);
+        }
+    }
 
-		ArrayAdapter<String> tagAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_spinner_item, tagNames);
-		tagAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		tagSpinner.setAdapter(tagAdapter);
+    @Override
+    public void onGroupCollapse(int groupPosition) {
+        onGroupExpand(groupPosition);
+    }
 
-		// Save the state into the return Intent whenever the field
-		tagSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> arg0, View arg1,
-                    int arg2, long arg3) {
-                updateResult();
+    /**
+     * Called when the {@code Activity} is being terminated. This method determines the state of the {@code Activity} and what
+     * sort of result should be returned to <i>Locale</i>.
+     */
+    @Override
+    public void finish()
+    {
+        if (isCancelled)
+            setResult(RESULT_CANCELED);
+        else
+        {
+            final FilterListItem selected = adapter.getSelection();
+            final int intervalIndex = interval.getSelectedItemPosition();
+
+            /*
+             * If the message is of 0 length, then there isn't a setting to save.
+             */
+            if (selected == null)
+            {
+                /*
+                 * Note: many settings will not need to use the RESULT_REMOVE result. This is only needed for settings that have
+                 * an "invalid" state that shouldn't be saved. For example, an saving empty Toast message doesn't make sense. The
+                 * Ringer Volume setting doesn't have such an "invalid" state, and therefore doesn't use this result code
+                 */
+                setResult(com.twofortyfouram.Intent.RESULT_REMOVE);
             }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> arg0) {
-                // do nothing
+            else
+            {
+                /*
+                 * This is the return Intent, into which we'll put all the required extras
+                 */
+                final Intent returnIntent = new Intent(ACTION_LOCALE_ALERT);
+
+                /*
+                 * This extra is the data to ourselves: either for the Activity or the BroadcastReceiver. Note that anything
+                 * placed in this bundle must be available to Locale's class loader. So storing String, int, and other basic
+                 * objects will work just fine. You cannot store an object that only exists in your project, as Locale will be
+                 * unable to serialize it.
+                 */
+                final Bundle storeAndForwardExtras = new Bundle();
+
+                Filter filterItem = (Filter) selected;
+                storeAndForwardExtras.putString(KEY_FILTER_TITLE, filterItem.title);
+                storeAndForwardExtras.putString(KEY_SQL, filterItem.sqlQuery);
+                storeAndForwardExtras.putInt(KEY_INTERVAL, INTERVALS[intervalIndex]);
+
+                returnIntent.putExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE, storeAndForwardExtras);
+
+                /*
+                 * This is the blurb concisely describing what your setting's state is. This is simply used for display in the UI.
+                 */
+                if (filterItem.title.length() > com.twofortyfouram.Intent.MAXIMUM_BLURB_LENGTH)
+                    returnIntent.putExtra(com.twofortyfouram.Intent.EXTRA_STRING_BLURB, filterItem.title.substring(0, com.twofortyfouram.Intent.MAXIMUM_BLURB_LENGTH));
+                else
+                    returnIntent.putExtra(com.twofortyfouram.Intent.EXTRA_STRING_BLURB, filterItem.title);
+
+                setResult(RESULT_OK, returnIntent);
             }
+        }
 
-		});
-	}
+        super.finish();
+    }
+
+    // --- boring stuff
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        adapter.registerRecevier();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        adapter.unregisterRecevier();
+    }
 
     @Override
     protected void onStart() {
         super.onStart();
-
-        // set up flurry
         FlurryAgent.onStartSession(this, Constants.FLURRY_KEY);
     }
 
@@ -108,86 +274,50 @@ public final class LocaleEditAlerts extends Activity {
         FlurryAgent.onEndSession(this);
     }
 
-	/**
-	 * Private helper method to persist the Toast message in the return {@code Intent}.
-	 */
-	private void updateResult() {
-	    // no tags, so it's not possible to save
-	    if(tagNames.length == 0) {
-	        setResult(com.twofortyfouram.Intent.RESULT_REMOVE);
-	        return;
-	    }
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu)
+    {
+        super.onCreateOptionsMenu(menu);
 
-		final int index = ((Spinner) findViewById(R.id.spinner)).getSelectedItemPosition();
-		final String tagName = tagNames[index];
-		final TagModelForView tag = tags.get(index);
+        final PackageManager manager = getPackageManager();
 
         /*
-         * If the message is of 0 length, then there isn't a setting to save
+         * We are dynamically loading resources from Locale's APK. This will only work if Locale is actually installed
          */
-        if (tagName == null) {
-            setResult(com.twofortyfouram.Intent.RESULT_REMOVE);
-        } else {
-            final Intent intent = new Intent();
-            intent.putExtra(com.twofortyfouram.Intent.EXTRA_STRING_ACTION_FIRE,
-            		ACTION_LOCALE_ALERT);
-            intent.putExtra(KEY_TAG_ID, tag.getTagIdentifier().getId());
-            intent.putExtra(KEY_TAG_NAME, tagName);
-            intent.putExtra(com.twofortyfouram.Intent.EXTRA_STRING_BLURB, tagName);
-            setResult(RESULT_OK, intent);
+        menu.add(0, MENU_DONT_SAVE, 0, SharedResources.getTextResource(manager, SharedResources.STRING_MENU_DONTSAVE))
+            .setIcon(SharedResources.getDrawableResource(manager, SharedResources.DRAWABLE_MENU_DONTSAVE)).getItemId();
+
+        menu.add(0, MENU_SAVE, 0, SharedResources.getTextResource(manager, SharedResources.STRING_MENU_SAVE))
+            .setIcon(SharedResources.getDrawableResource(manager, SharedResources.DRAWABLE_MENU_SAVE)).getItemId();
+
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onMenuItemSelected(final int featureId, final MenuItem item)
+    {
+        switch (item.getItemId())
+        {
+            case MENU_SAVE:
+            {
+                finish();
+                return true;
+            }
+            case MENU_DONT_SAVE:
+            {
+                isCancelled = true;
+                finish();
+                return true;
+            }
         }
-	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean onCreateOptionsMenu(final Menu menu) {
-		super.onCreateOptionsMenu(menu);
-
-		getMenuInflater().inflate(R.menu.locale_edit_alerts, menu);
-
-		menu.findItem(R.id.menu_save).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener()
-		{
-			public boolean onMenuItemClick(final MenuItem item)
-			{
-				updateResult();
-				finish();
-				return true;
-			}
-		});
-
-		menu.findItem(R.id.menu_dontsave).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener()
-		{
-			public boolean onMenuItemClick(final MenuItem item)
-			{
-				setResult(RESULT_CANCELED);
-				finish();
-				return true;
-			}
-		});
-
-		menu.findItem(R.id.menu_help).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener()
-		{
-			public boolean onMenuItemClick(final MenuItem item)
-			{
-
-				final Intent helpIntent = new Intent(com.twofortyfouram.Intent.ACTION_HELP);
-				helpIntent.putExtra("com.twofortyfouram.locale.intent.extra.HELP_URL", "http://www.androidlocale.com/app_data/toast/1.0/help_toast.htm"); //$NON-NLS-1$ //$NON-NLS-2$
-
-				// Set up the breadcrumbs in the title bar
-				String breadcrumbString = getIntent().getStringExtra(com.twofortyfouram.Intent.EXTRA_STRING_BREADCRUMB);
-				if (breadcrumbString == null)
-					helpIntent.putExtra(com.twofortyfouram.Intent.EXTRA_STRING_BREADCRUMB, getString(R.string.locale_edit_alerts_title));
-				else
-					helpIntent.putExtra(com.twofortyfouram.Intent.EXTRA_STRING_BREADCRUMB, breadcrumbString + com.twofortyfouram.Intent.BREADCRUMB_SEPARATOR
-							+ getString(R.string.locale_edit_alerts_title));
-
-				startActivity(helpIntent);
-				return true;
-			}
-		});
-
-		return true;
-	}
+        return super.onOptionsItemSelected(item);
+    }
+
 }
\ No newline at end of file
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
index 735d70e17..40ee2c1de 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
@@ -1,8 +1,7 @@
 package com.todoroo.astrid.locale;
 
-import java.util.HashSet;
-import java.util.LinkedList;
-
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -10,10 +9,18 @@ import android.content.res.Resources;
 import android.util.Log;
 
 import com.timsu.astrid.R;
-import com.timsu.astrid.data.TaskController;
-import com.timsu.astrid.data.TaskIdentifier;
-import com.timsu.astrid.data.tag.TagController;
-import com.timsu.astrid.data.tag.TagIdentifier;
+import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.service.NotificationManager;
+import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager;
+import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.astrid.activity.ShortcutActivity;
+import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.model.Task;
+import com.todoroo.astrid.service.TaskService;
+import com.todoroo.astrid.utility.Constants;
+import com.todoroo.astrid.utility.Preferences;
 
 /**
  * Receiver is activated when Locale conditions are triggered
@@ -23,56 +30,67 @@ import com.timsu.astrid.data.tag.TagIdentifier;
  */
 public class LocaleReceiver extends BroadcastReceiver {
 
-    /** minimum amount of time between two notifications */
-    private static final long MIN_NOTIFY_INTERVAL = 12*3600*1000L;
+    @Autowired
+    private TaskService taskService;
+
+    /**
+     * Create a preference key for storing / retrieving last interval time
+     * @param filterTitle
+     * @param interval
+     * @return
+     */
+    private String makePreferenceKey(String filterTitle, int interval) {
+        return "LOCALE:" + filterTitle + interval; //$NON-NLS-1$
+    }
 
+    @SuppressWarnings("nls")
     @Override
     /** Called when the system is started up */
     public void onReceive(Context context, Intent intent) {
     	try {
 	    	if (LocaleEditAlerts.ACTION_LOCALE_ALERT.equals(intent.getAction())) {
-				final long tagId = intent.getLongExtra(LocaleEditAlerts.KEY_TAG_ID, 0);
-				final String tagName = intent.getStringExtra(LocaleEditAlerts.KEY_TAG_NAME);
-				if(tagId == 0) {
-					Log.w("astrid-locale", "Invalid tag identifier in alert");
-					return;
-				}
+	    	    final String title = intent.getStringExtra(LocaleEditAlerts.KEY_FILTER_TITLE);
+				final String sql = intent.getStringExtra(LocaleEditAlerts.KEY_SQL);
+				final int interval = intent.getIntExtra(LocaleEditAlerts.KEY_INTERVAL, 24*3600);
 
 				// check if we've already made a notification recently
-			    if(System.currentTimeMillis() - Preferences.
-			            getLocaleLastAlertTime(context, tagId) < MIN_NOTIFY_INTERVAL) {
-			        Log.w("astrid-locale", "Too soon, need " + (MIN_NOTIFY_INTERVAL - System.currentTimeMillis() + Preferences.
-                        getLocaleLastAlertTime(context, tagId))/1000L + " more seconds");
+				String preferenceKey = makePreferenceKey(title, interval);
+				long lastNotifyTime = Preferences.getLong(preferenceKey, 0);
+				if(DateUtilities.now() - lastNotifyTime < interval * 1000L) {
+			        Log.i("astrid-locale", title + ": Too soon, need " + (interval
+			                - (DateUtilities.now() - lastNotifyTime)/1000) + " more seconds");
 			        return;
 				}
 
 				// find out if we have active tasks with this tag
-				TaskController taskController = new TaskController(context);
-				taskController.open();
-				TagController tagController = new TagController(context);
-				tagController.open();
+				DependencyInjectionService.getInstance().inject(this);
+				Filter filter = new Filter(title, title, null, null);
+				filter.sqlQuery = sql;
+				TodorooCursor<Task> cursor = taskService.fetchFiltered(filter, Task.ID);
 				try {
-					HashSet<TaskIdentifier> activeTasks = taskController.getActiveVisibleTaskIdentifiers();
-					LinkedList<TaskIdentifier> tasks = tagController.getTaggedTasks(
-							new TagIdentifier(tagId));
-//					int count = TagListSubActivity.countActiveTasks(activeTasks, tasks);
-					int count = 0;
-					if(count > 0) {
-						Resources r = context.getResources();
-//						String reminder = r.getString(R.string.notif_tagNotification).
-						String reminder = "$NUM of $TAG".
-						    replace("$NUM", r.getQuantityString(R.plurals.Ntasks, count, count)).
-						    replace("$TAG", tagName);
-//						ReminderService.showTagNotification(context, tagId, reminder);
+				    if(cursor.getCount() == 0)
+				        return;
+					Resources r = context.getResources();
+					String reminder = r.getString(R.string.locale_notification).
+						    replace("$NUM", r.getQuantityString(R.plurals.Ntasks,
+						            cursor.getCount(), cursor.getCount())).
+						    replace("$FILTER", title);
+
+					// show a reminder
+		            Intent notifyIntent = ShortcutActivity.createIntent(filter);
+		            notifyIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		            PendingIntent pendingIntent = PendingIntent.getActivity(context,
+		                    Constants.NOTIFICATION_TIMER, notifyIntent, 0);
+		            Notification notification = new Notification(
+		                    R.drawable.timers_notification, reminder, System.currentTimeMillis());
+		            notification.setLatestEventInfo(context, r.getString(R.string.locale_edit_alerts_title),
+		                    reminder, pendingIntent);
 
-						Preferences.setLocaleLastAlertTime(context, tagId,
-						        System.currentTimeMillis());
-					} else {
-					    Log.w("astrid-locale", "Locale Notification, but no tasks to show");
-					}
+		            NotificationManager nm = new AndroidNotificationManager(context);
+		            nm.notify(Constants.NOTIFICATION_TIMER, notification);
+					Preferences.setLong(preferenceKey, DateUtilities.now());
 				} finally {
-					taskController.close();
-					tagController.close();
+					cursor.close();
 				}
 	    	}
     	} catch (Exception e) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java
index c0ce129b0..2178ffb95 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java
@@ -11,7 +11,6 @@ import android.content.Intent;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.QueryTemplate;
-import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterCategory;
@@ -44,7 +43,7 @@ public class MilkFilterExposer extends BroadcastReceiver {
                 MilkDataService.METADATA_JOIN).where(Criterion.and(
                         MetadataCriteria.withKey(MilkTask.METADATA_KEY),
                         TaskCriteria.isActive(),
-                        TaskCriteria.isVisible(DateUtilities.now()),
+                        TaskCriteria.isVisible(),
                         MilkTask.LIST_ID.eq(list.id))),
                 values);
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkDataService.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkDataService.java
index a17fadd32..e8f01fba6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkDataService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkDataService.java
@@ -22,7 +22,6 @@ import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
-import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.SoftHashMap;
 import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.TaskDao;
@@ -267,7 +266,7 @@ public final class MilkDataService {
         // read all list counts
         TodorooCursor<Metadata> cursor = metadataDao.query(Query.select(MilkTask.LIST_ID, COUNT).
             join(Join.inner(Task.TABLE, Metadata.TASK.eq(Task.ID))).
-            where(Criterion.and(TaskCriteria.isVisible(DateUtilities.now()), TaskCriteria.isActive())).
+            where(Criterion.and(TaskCriteria.isVisible(), TaskCriteria.isActive())).
             groupBy(MilkTask.LIST_ID));
         try {
             for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index f0d089156..21cd47712 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -12,7 +12,6 @@ import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.QueryTemplate;
-import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
@@ -95,7 +94,7 @@ public final class TagService {
         return new QueryTemplate().where(Criterion.and(
                 Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where(MetadataCriteria.withKey(KEY)))),
                 TaskCriteria.isActive(),
-                TaskCriteria.isVisible(DateUtilities.now())));
+                TaskCriteria.isVisible()));
     }
 
     /**
diff --git a/astrid/res/drawable/filter_selected_icon.png b/astrid/res/drawable/filter_selected_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e90f6312a2272dbd304d94c8a8f1792ac138cb6c
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jie7oTIEGZ*O8WEvzdiF&h7^vOGvqriH$-&AFwbbLcwEnM
z!*89UZUFN=ri~_+Y%TxY8SD#YOv-3r6sT{OGLTgB>tbBw@P{SqK&Zkqm8$|~3U)lE
z3{Qk~Qz|8#Wjm5TN*J+g${1aI>eymyGUY$RMr|?Xq6s`VI?f6ST<lo#f?43Tl4e1Z
z6dx16BPaKCMIH~%=k_KaR2m{!JK`OW{&V0>Igrl5FA(o!^g=~yKWqE}<zkVEIc{vn
z7o41<;hd28LHJ}te!yW#55pElsa694KOd{4BZ2dL*dFye#5nsD9`fjQ%KRX~B#^-H
YR?aQuPvjm&psyJ`UHx3vIVCg!0LDIWZvX%Q

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
new file mode 100644
index 000000000..2115ec3fe
--- /dev/null
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See the file "LICENSE" for the full license governing this code. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:drawable/list_selector_background"
+    android:paddingTop="4dip"
+    android:paddingBottom="4dip"
+    android:paddingLeft="4dip"
+    android:paddingRight="6dip"
+    android:orientation="horizontal">
+        
+    <!-- expander icon -->
+    <ImageView android:id="@+id/expander"
+        android:layout_width="32dip"
+        android:layout_height="fill_parent"
+        android:layout_weight="1"
+        android:paddingLeft="5dip" 
+        android:paddingRight="5dip" 
+        android:scaleType="fitCenter"
+        android:visibility="gone"/>
+        
+    <!-- filter icon -->
+    <ImageView android:id="@+id/icon"
+        android:layout_width="32dip"
+        android:layout_height="fill_parent"
+        android:layout_weight="1"
+        android:paddingLeft="5dip" 
+        android:paddingRight="5dip" 
+        android:scaleType="fitCenter"
+        android:visibility="gone"/>
+            
+    <!-- filter name -->
+    <TextView android:id="@+id/name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="100"
+        android:paddingLeft="5dip" 
+        android:gravity="center_vertical"/>
+        
+    <!-- selected -->
+    <ImageView android:id="@+id/selected"
+        android:layout_width="24dip"
+        android:layout_height="fill_parent"
+        android:layout_weight="1"
+        android:paddingLeft="5dip" 
+        android:paddingRight="5dip" 
+        android:src="@drawable/filter_selected_icon"
+        android:scaleType="fitCenter"
+        android:visibility="gone"/>
+                    
+</LinearLayout>
diff --git a/astrid/res/layout/locale_edit_alerts.xml b/astrid/res/layout/locale_edit_alerts.xml
index ca985939b..082a194c1 100644
--- a/astrid/res/layout/locale_edit_alerts.xml
+++ b/astrid/res/layout/locale_edit_alerts.xml
@@ -5,32 +5,52 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
     
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/locale_edit_intro" />
-
+    <!-- At runtime, we'll load the Locale background frame -->
     <LinearLayout
+        android:id="@+id/frame"
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/locale_border"
-        android:layout_margin="10dip">
+        android:layout_weight="1">
 
         <TextView
-            android:paddingTop="5dip"
-            android:paddingBottom="10dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/locale_pick_filter"
+            android:paddingBottom="10px"
+            android:gravity="center"
+            android:text="@string/locale_edit_intro"
             style="@style/TextAppearance.Locale_Label" />
             
-        <Spinner
-            android:paddingBottom="10dip"
-            android:id="@+id/spinner"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
+            <FrameLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="100"
+                android:layout_margin="10px"
+                android:background="@drawable/locale_border">
+    
+                <ExpandableListView android:id="@android:id/list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:scrollbars="vertical"
+                    android:cacheColorHint="@android:color/white"/>
+                
+            </FrameLayout>
+                
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/locale_interval_label"
+                style="@style/TextAppearance.Locale_Label" />
+        
+            <Spinner android:id="@+id/intervalSpinner"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" 
+                android:layout_weight="1"
+                android:paddingBottom="10dip"
+                android:entries="@array/locale_interval" />
             
     </LinearLayout>
+    
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/locale_ellipsizing_title.xml b/astrid/res/layout/locale_ellipsizing_title.xml
deleted file mode 100644
index 5a513acea..000000000
--- a/astrid/res/layout/locale_ellipsizing_title.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/screen"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
->
-    <TextView
-        android:id="@+id/locale_ellipsizing_title_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_gravity="center_vertical"
-        android:textColor="#FFFFFF"
-        android:textStyle="bold"
-        android:ellipsize="start"
-        android:singleLine="true" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index bad4d561a..a46138de7 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -35,8 +35,6 @@
             <TextView android:id="@+id/title"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_toRightOf="@id/completeBox"
                 style="@style/TextAppearance.TAd_ItemTitle"
                 android:gravity="center_vertical"/>
         
@@ -44,8 +42,6 @@
             <TextView android:id="@+id/dueDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/title"
-                android:layout_toRightOf="@id/completeBox"
                 android:singleLine="true"/>
               
             <TextView android:id="@+id/details"
@@ -70,8 +66,6 @@
     <LinearLayout android:id="@+id/actions"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/details"
-        android:layout_alignParentLeft="true"
         android:background="#4499bbcc" 
         android:visibility="gone"
         android:paddingTop="4dip"
diff --git a/astrid/res/menu/locale_edit_alerts.xml b/astrid/res/menu/locale_edit_alerts.xml
deleted file mode 100644
index 5c757b0c5..000000000
--- a/astrid/res/menu/locale_edit_alerts.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
->
-    <item
-        android:title="Help"
-        android:icon="@drawable/icon_help_color_40"
-        android:id="@+id/menu_help" />
-    <item
-        android:title="Don't Save"
-        android:icon="@drawable/icon_dontsave_color_40"
-        android:id="@+id/menu_dontsave" />
-    <item
-        android:title="Save"
-        android:icon="@drawable/icon_save_color_40"
-        android:id="@+id/menu_save" />
-</menu>
\ No newline at end of file
diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml
index 8fcfbd469..77f5a901d 100644
--- a/astrid/res/values/strings-filters.xml
+++ b/astrid/res/values/strings-filters.xml
@@ -8,7 +8,7 @@
     <string name="BFE_Active">Active Tasks</string>
         
     <!-- Title for Active Tasks Filter (what user sees when first opening the app) -->
-    <string name="BFE_Active_title">Astrid: Home</string>
+    <string name="BFE_Active_title">Active Tasks</string>
     
     <!-- Search -->
     <string name="BFE_Search">Search</string>
diff --git a/astrid/res/values/strings-locale.xml b/astrid/res/values/strings-locale.xml
index d39e9b3e1..bf9eaa99f 100644
--- a/astrid/res/values/strings-locale.xml
+++ b/astrid/res/values/strings-locale.xml
@@ -2,22 +2,54 @@
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Resources for built-in locale plug-in -->
+  <!-- Resources for built-in locale plug-in -->
 
   <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid Tag Alert</string>
+  <string name="locale_edit_alerts_title">Astrid Filter Alert</string>
   
   <!-- Locale Window Help -->                                                                                                                                            
   <string name="locale_edit_intro">Astrid will send you a reminder                                                                                                                                             
-      when you have uncompleted tasks in the following filter:</string>
+      when you have any tasks in the following filter:</string>
       
   <!-- Locale Window Filter Picker UI -->                                                                                                                                        
   <string name="locale_pick_filter">Filter:</string>        
+      
+  <!-- Locale Window Interval Label -->                                                                                                                                        
+  <string name="locale_interval_label">Limit notifications to:</string>        
+      
+  <!-- Locale Window Interval Values -->                                                                                                                                        
+  <string-array name="locale_interval">
+    <item>once an hour</item>
+    <item>once every six hours</item>
+    <item>once every twelve hours</item>
+    <item>once a day</item>
+    <item>once every three days</item>
+    <item>once a week</item>
+  </string-array>        
+      
+  <!-- Notification -->                                                                                                                                        
+  <string name="locale_notification">You have $NUM tasks in $FILTER</string>        
 
   <!-- Locale style -->
   <style name="TextAppearance.Locale_Label">                                                                                                                                                                       
       <item name="android:textSize">16sp</item>                                                                                                                                                                    
       <item name="android:textColor">@android:color/black</item>                                                                                                                                                   
   </style>   
+  
+  <!-- Locale filter list styles -->
+  <style name="TextAppearance.LEA_Filter">
+      <item name="android:textSize">14sp</item>
+      <item name="android:textColor">@android:color/black</item>
+  </style>
+  
+  <style name="TextAppearance.LEA_Header" parent="TextAppearance.LEA_Filter">
+      <item name="android:textSize">13sp</item>
+      <item name="android:textColor">#ffdddddd</item>
+  </style>
+  
+  <style name="TextAppearance.LEA_Category" parent="TextAppearance.LEA_Filter">
+      <item name="android:textSize">13sp</item>
+      <item name="android:textStyle">bold|italic</item>
+  </style>
 
 </resources>
diff --git a/astrid/res/values/styles-3.0.xml b/astrid/res/values/styles-3.0.xml
index bd9f72c4a..4be7a183d 100644
--- a/astrid/res/values/styles-3.0.xml
+++ b/astrid/res/values/styles-3.0.xml
@@ -2,7 +2,7 @@
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- ============================ General =============================  -->
+    <!-- ========================================================== General  -->
     
     <style name="TextAppearance" parent="android:TextAppearance" />
     
@@ -16,7 +16,7 @@
         <item name="android:windowBackground">@null</item>
     </style>
     
-    <!--========================= TaskListActivity ========================  -->
+    <!--=============================================== TaskListActivity == -->
     
     <style name="TextAppearance.TLA_NoItems">
         <item name="android:textSize">20sp</item>
@@ -33,7 +33,7 @@
         <item name="android:textColor">#000000</item>        
     </style>
 
-    <!-- =========================== TaskAdapter =========================== -->
+    <!-- ==================================================== TaskAdapter == -->
 
     <style name="TextAppearance.TAd_ItemTitle">
     </style>
@@ -62,25 +62,24 @@
         <item name="android:textColor">#ffee5555</item>
     </style>
 
-    <!-- ======================== FilterListAdapter ======================== -->
+    <!-- ============================================== FilterListAdapter == -->
 
-    <style name="TextAppearance.FLA_Filter" parent="TextAppearance.TAd_ItemTitle">
+    <style name="TextAppearance.FLA_Filter">
         <item name="android:textSize">20sp</item>
-        <item name="android:paddingLeft">10dip</item>
     </style>
     
-    <style name="TextAppearance.FLA_Header" parent="TextAppearance.TAd_ItemTitle">
+    <style name="TextAppearance.FLA_Header" parent="TextAppearance.FLA_Filter">
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">#ffdddddd</item>
     </style>
     
-    <style name="TextAppearance.FLA_Category" parent="TextAppearance.TAd_ItemTitle">
+    <style name="TextAppearance.FLA_Category" parent="TextAppearance.FLA_Filter">
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">#ff7ada24</item>
         <item name="android:textStyle">bold|italic</item>
     </style>
 
-    <!-- ======================== FilterListAdapter ======================== -->
+    <!-- ========================================================= Widget == -->
 
     <style name="TextAppearance.Widget">                                                                                                                                                                                      
         <item name="android:textSize">14sp</item>                                                                                                                                                                    
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 41dd55a32..951975439 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -6,32 +6,28 @@ package com.todoroo.astrid.activity;
 import android.app.AlertDialog;
 import android.app.ExpandableListActivity;
 import android.app.SearchManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.os.Parcelable;
 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.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.Toast;
-import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -42,9 +38,7 @@ import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.adapter.FilterAdapter;
-import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.FilterCategory;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.SearchFilter;
 import com.todoroo.astrid.model.Task;
@@ -77,7 +71,6 @@ public class FilterListActivity extends ExpandableListActivity {
     protected DialogUtilities dialogUtilities;
 
     FilterAdapter adapter = null;
-    FilterReceiver filterReceiver = new FilterReceiver();
 
     /* ======================================================================
      * ======================================================= initialization
@@ -98,7 +91,6 @@ public class FilterListActivity extends ExpandableListActivity {
 
         setTitle(R.string.FLA_title);
         setUpList();
-        getLists();
 
         onNewIntent(getIntent());
     }
@@ -169,44 +161,13 @@ public class FilterListActivity extends ExpandableListActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        registerReceiver(filterReceiver,
-                new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS));
+        adapter.registerRecevier();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        unregisterReceiver(filterReceiver);
-    }
-
-    /**
-     * Receiver which receives intents to add items to the filter list
-     *
-     * @author Tim Su <tim@todoroo.com>
-     *
-     */
-    protected class FilterReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            try {
-                final Parcelable[] filters = intent.getExtras().
-                    getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE);
-                for (Parcelable item : filters) {
-                    adapter.add((FilterListItem)item);
-                }
-                adapter.notifyDataSetChanged();
-
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        expandList(filters);
-                    }
-                });
-            } catch (Exception e) {
-                exceptionService.reportError("receive-filter-" + //$NON-NLS-1$
-                        intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), e);
-            }
-        }
+        adapter.unregisterRecevier();
     }
 
     /* ======================================================================
@@ -215,39 +176,11 @@ public class FilterListActivity extends ExpandableListActivity {
 
     /** Sets up the coach list adapter */
     protected void setUpList() {
-        adapter = new FilterAdapter(this);
+        adapter = new FilterAdapter(this, getExpandableListView(),
+                R.layout.filter_adapter_row);
         setListAdapter(adapter);
 
         registerForContextMenu(getExpandableListView());
-        getExpandableListView().setGroupIndicator(
-                getResources().getDrawable(R.drawable.expander_group));
-    }
-
-    /**
-     * Expand the first category filter in this group
-     * @param filters
-     */
-    protected void expandList(Parcelable[] filters) {
-        ExpandableListView list = getExpandableListView();
-        for(Parcelable filter : filters) {
-            if(filter instanceof FilterCategory) {
-                for(int i = 0; i < adapter.getGroupCount(); i++)
-                    if(adapter.getGroup(i) == filter) {
-                        list.expandGroup(i);
-                        return;
-                    }
-            }
-        }
-    }
-
-    /**
-     * Broadcast a request for lists. The request is sent to every
-     * application registered to listen for this broadcast. Each application
-     * can then add lists to this activity
-     */
-    protected void getLists() {
-        Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_FILTERS);
-        sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
     }
 
     /* ======================================================================
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 420608dbf..0c8d7e172 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -6,35 +6,62 @@ package com.todoroo.astrid.adapter;
 import java.util.ArrayList;
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.os.Parcelable;
 import android.util.DisplayMetrics;
-import android.view.Gravity;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.BaseExpandableListAdapter;
-import android.widget.FrameLayout;
+import android.widget.ExpandableListView;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.ImageView.ScaleType;
 
 import com.timsu.astrid.R;
+import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.FilterCategory;
 import com.todoroo.astrid.api.FilterListHeader;
 import com.todoroo.astrid.api.FilterListItem;
 
 public class FilterAdapter extends BaseExpandableListAdapter {
 
-    private final ArrayList<FilterListItem> items;
+    // --- style constants
+
+    public int filterStyle = R.style.TextAppearance_FLA_Filter;
+    public int categoryStyle = R.style.TextAppearance_FLA_Category;
+    public int headerStyle = R.style.TextAppearance_FLA_Header;
+
+    // --- instance variables
+
     protected final Activity activity;
+    protected final ExpandableListView listView;
+    private final ArrayList<FilterListItem> items;
     private final DisplayMetrics metrics = new DisplayMetrics();
+    private final FilterReceiver filterReceiver = new FilterReceiver();
+    private final int layout;
+    private final LayoutInflater inflater;
 
-    public FilterAdapter(Activity activity) {
+    public FilterAdapter(Activity activity, ExpandableListView listView,
+            int rowLayout) {
         super();
         this.activity = activity;
         this.items = new ArrayList<FilterListItem>();
+        this.listView = listView;
+        this.layout = rowLayout;
+
+        inflater = (LayoutInflater) activity.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
 
         activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        listView.setGroupIndicator(
+                activity.getResources().getDrawable(R.drawable.expander_group));
+
+        getLists();
     }
 
     public boolean hasStableIds() {
@@ -49,6 +76,35 @@ public class FilterAdapter extends BaseExpandableListAdapter {
         items.clear();
     }
 
+    /**
+     * Create or reuse a view
+     * @param convertView
+     * @param parent
+     * @return
+     */
+    protected View newView(View convertView, ViewGroup parent) {
+        if(convertView == null) {
+            convertView = inflater.inflate(layout, parent, false);
+            ViewHolder viewHolder = new ViewHolder();
+            viewHolder.view = convertView;
+            viewHolder.expander = (ImageView)convertView.findViewById(R.id.expander);
+            viewHolder.icon = (ImageView)convertView.findViewById(R.id.icon);
+            viewHolder.name = (TextView)convertView.findViewById(R.id.name);
+            viewHolder.selected = (ImageView)convertView.findViewById(R.id.selected);
+            convertView.setTag(viewHolder);
+        }
+        return convertView;
+    }
+
+    private class ViewHolder {
+        public FilterListItem item;
+        public ImageView expander;
+        public ImageView icon;
+        public TextView name;
+        public ImageView selected;
+        public View view;
+    }
+
     /* ======================================================================
      * ========================================================== child nodes
      * ====================================================================== */
@@ -74,9 +130,13 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
     public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
             View convertView, ViewGroup parent) {
-        FilterListItem item = (FilterListItem)getChild(groupPosition, childPosition);
-        View textView = getStandardView(item, true);
-        return textView;
+
+        convertView = newView(convertView, parent);
+        ViewHolder viewHolder = (ViewHolder) convertView.getTag();
+        viewHolder.item = (FilterListItem)getChild(groupPosition, childPosition);
+        populateView(viewHolder, true, false);
+
+        return convertView;
     }
 
     /* ======================================================================
@@ -97,8 +157,11 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
     public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
             ViewGroup parent) {
-        View view = getView((FilterListItem)getGroup(groupPosition), false, isExpanded);
-        return view;
+        convertView = newView(convertView, parent);
+        ViewHolder viewHolder = (ViewHolder) convertView.getTag();
+        viewHolder.item = (FilterListItem) getGroup(groupPosition);
+        populateView(viewHolder, false, isExpanded);
+        return convertView;
     }
 
     public boolean isChildSelectable(int groupPosition, int childPosition) {
@@ -106,110 +169,156 @@ public class FilterAdapter extends BaseExpandableListAdapter {
     }
 
     /* ======================================================================
-     * ================================================================ views
+     * ============================================================ selection
      * ====================================================================== */
 
-    public View getView(FilterListItem item, boolean isChild, boolean isExpanded) {
-        if(item instanceof FilterListHeader)
-            return getHeaderView((FilterListHeader)item, isChild);
-        else if(item instanceof FilterCategory)
-            return getCategoryView((FilterCategory)item, isExpanded);
-        else
-            return getStandardView(item, isChild);
-    }
-
-    public View getCategoryView(FilterCategory filter, boolean isExpanded) {
-        AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    private FilterListItem selection = null;
 
-        FrameLayout layout = new FrameLayout(activity);
-        layout.setLayoutParams(lp);
-
-        ImageView image = new ImageView(activity);
-        if(isExpanded)
-            image.setImageResource(R.drawable.expander_ic_maximized);
+    /**
+     * Sets the selected item to this one
+     * @param picked
+     */
+    public void setSelection(FilterListItem picked) {
+        if(picked == selection)
+            selection = null;
         else
-            image.setImageResource(R.drawable.expander_ic_minimized);
-        FrameLayout.LayoutParams expansionImageLayout = new FrameLayout.LayoutParams(
-                32, 32);
-        expansionImageLayout.gravity = Gravity.CENTER_VERTICAL;
-        image.setPadding(5, 0, 5, 0);
-        image.setLayoutParams(expansionImageLayout);
-        image.setScaleType(ScaleType.FIT_CENTER);
-        layout.addView(image);
-
-        TextView textView = new TextView(activity);
-        textView.setGravity(Gravity.CENTER_VERTICAL);
-        textView.setText(filter.listingTitle);
-        textView.setTextAppearance(activity, R.style.TextAppearance_FLA_Category);
+            selection = picked;
+        int scroll = listView.getScrollY();
+        notifyDataSetInvalidated();
+        listView.scrollTo(0, scroll);
+    }
 
-        View view = augmentView(textView, filter);
-        view.setPadding((int) (33 * metrics.density), 5, 0, 5);
-        FrameLayout.LayoutParams rowLayout = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        rowLayout.gravity = Gravity.CENTER_VERTICAL;
-        view.setLayoutParams(rowLayout);
+    /**
+     * Gets the currently selected item
+     * @return null if no item is to be selected
+     */
+    public FilterListItem getSelection() {
+        return selection;
+    }
 
-        layout.addView(view);
+    /* ======================================================================
+     * ============================================================= receiver
+     * ====================================================================== */
 
-        return layout;
+    /**
+     * Receiver which receives intents to add items to the filter list
+     *
+     * @author Tim Su <tim@todoroo.com>
+     *
+     */
+    public class FilterReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            try {
+                final Parcelable[] filters = intent.getExtras().
+                    getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE);
+                for (Parcelable item : filters) {
+                    add((FilterListItem)item);
+                    onReceiveFilter((FilterListItem)item);
+                }
+                notifyDataSetChanged();
+
+                activity.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        expandList(filters);
+                    }
+                });
+            } catch (Exception e) {
+                Log.e("receive-filter-" +  //$NON-NLS-1$
+                        intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON),
+                        e.toString(), e);
+            }
+        }
     }
 
     /**
-     * Decorate textview and add an image if the filter requests it
-     * @param textView
-     * @param filter
-     * @return final view ready to be added
+     * Expand the first category filter in this group
+     * @param filters
      */
-    private View augmentView(TextView textView, FilterListItem filter) {
-        if(filter.listingIcon != null) {
-            LinearLayout layout = new LinearLayout(activity);
-            layout.setGravity(textView.getGravity());
-            layout.setOrientation(LinearLayout.HORIZONTAL);
-
-            ImageView icon = new ImageView(activity);
-            icon.setImageBitmap(filter.listingIcon);
-            icon.setScaleType(ScaleType.CENTER);
-            icon.setPadding(0, 0, 15, 0);
-            layout.addView(icon);
-            layout.addView(textView);
-            return layout;
+    protected void expandList(Parcelable[] filters) {
+        for(Parcelable filter : filters) {
+            if(filter instanceof FilterCategory) {
+                for(int i = 0; i < getGroupCount(); i++)
+                    if(getGroup(i) == filter) {
+                        listView.expandGroup(i);
+                        return;
+                    }
+            }
         }
-
-        return textView;
     }
 
-    public View getStandardView(FilterListItem filter, boolean isChild) {
-        AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    /**
+     * Broadcast a request for lists. The request is sent to every
+     * application registered to listen for this broadcast. Each application
+     * can then add lists to this activity
+     */
+    protected void getLists() {
+        Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_FILTERS);
+        activity.sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
+    }
 
-        TextView textView = new TextView(activity);
-        textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
-        textView.setText(filter.listingTitle);
-        textView.setTextAppearance(activity, R.style.TextAppearance_FLA_Filter);
+    /**
+     * Call this method from your activity's onResume() method
+     */
+    public void registerRecevier() {
+        activity.registerReceiver(filterReceiver,
+                new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS));
+    }
 
-        View view = augmentView(textView, filter);
-        view.setBackgroundDrawable(null);
-        view.setLayoutParams(lp);
-        view.setPadding((int) ((isChild ? 27 : 7) * metrics.density), 8, 0, 8);
+    /**
+     * Call this method from your activity's onResume() method
+     */
+    public void unregisterRecevier() {
+        activity.unregisterReceiver(filterReceiver);
+    }
 
-        return view;
+    /**
+     * Called when an item comes through. Override if you like
+     * @param item
+     */
+    public void onReceiveFilter(FilterListItem item) {
+        // do nothing
     }
 
-    public View getHeaderView(FilterListHeader header, boolean isChild) {
-        AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    /* ======================================================================
+     * ================================================================ views
+     * ====================================================================== */
 
-        TextView textView = new TextView(activity);
-        textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
-        textView.setTextAppearance(activity, R.style.TextAppearance_FLA_Header);
-        textView.setText(header.listingTitle);
+    public void populateView(ViewHolder viewHolder, boolean isChild, boolean isExpanded) {
+        FilterListItem filter = viewHolder.item;
+
+        viewHolder.view.setBackgroundResource(0);
+        viewHolder.expander.setVisibility(View.GONE);
+
+        if(viewHolder.item instanceof FilterListHeader) {
+            viewHolder.name.setTextAppearance(activity, headerStyle);
+            viewHolder.view.setBackgroundResource(R.drawable.edit_titlebar);
+            viewHolder.view.setPadding((int) ((isChild ? 33 : 7) * metrics.density), 5, 0, 5);
+        } else if(viewHolder.item instanceof FilterCategory) {
+            viewHolder.expander.setVisibility(View.VISIBLE);
+            if(isExpanded)
+                viewHolder.expander.setImageResource(R.drawable.expander_ic_maximized);
+            else
+                viewHolder.expander.setImageResource(R.drawable.expander_ic_minimized);
+            viewHolder.name.setTextAppearance(activity, categoryStyle);
+            viewHolder.view.setPadding((int)(7 * metrics.density), 8, 0, 8);
+        } else {
+            viewHolder.name.setTextAppearance(activity, filterStyle);
+            viewHolder.view.setPadding((int) ((isChild ? 27 : 7) * metrics.density), 8, 0, 8);
+        }
+
+        viewHolder.icon.setVisibility(filter.listingIcon != null ? View.VISIBLE : View.GONE);
+        viewHolder.icon.setImageBitmap(filter.listingIcon);
 
-        View view = augmentView(textView, header);
-        view.setBackgroundResource(R.drawable.edit_titlebar);
-        view.setLayoutParams(lp);
-        view.setPadding((int) ((isChild ? 33 : 7) * metrics.density), 5, 0, 5);
+        viewHolder.name.setText(filter.listingTitle);
 
-        return view;
+        // selection
+        if(selection == viewHolder.item) {
+            viewHolder.selected.setVisibility(View.VISIBLE);
+            viewHolder.view.setBackgroundColor(Color.rgb(128, 230, 0));
+        } else
+            viewHolder.selected.setVisibility(View.GONE);
     }
+
 }
diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
index a6279fd3b..33b3d876f 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
@@ -16,6 +16,7 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
@@ -71,9 +72,9 @@ public class TaskDao extends GenericDao<Task> {
     	            Task.DELETION_DATE.eq(0));
     	}
 
-    	/** @return tasks that are not hidden at given unixtime */
-    	public static Criterion isVisible(long time) {
-    	    return Task.HIDE_UNTIL.lt(time);
+    	/** @return tasks that are not hidden at current time */
+    	public static Criterion isVisible() {
+    	    return Task.HIDE_UNTIL.lt(Functions.now());
         }
 
     	/** @return tasks that have a due date */
@@ -82,18 +83,18 @@ public class TaskDao extends GenericDao<Task> {
     	}
 
         /** @return tasks that are due before a certain unixtime */
-        public static Criterion dueBefore(long time) {
-            return Criterion.and(Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(time));
+        public static Criterion dueBeforeNow() {
+            return Criterion.and(Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.now()));
         }
 
         /** @return tasks that are due after a certain unixtime */
-        public static Criterion dueAfter(long time) {
-            return Task.DUE_DATE.gt(time);
+        public static Criterion dueAfterNow() {
+            return Task.DUE_DATE.gt(Functions.now());
         }
 
     	/** @return tasks completed before a given unixtime */
-    	public static Criterion completedBefore(long time) {
-    	    return Criterion.and(Task.COMPLETION_DATE.gt(0), Task.COMPLETION_DATE.lt(time));
+    	public static Criterion completed() {
+    	    return Criterion.and(Task.COMPLETION_DATE.gt(0), Task.COMPLETION_DATE.lt(Functions.now()));
     	}
 
     	/** @return tasks that have a blank or null title */
diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
index f0dd2a25d..195e35389 100644
--- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
+++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
@@ -21,6 +21,7 @@ import android.util.Log;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.timsu.astrid.R;
+import com.timsu.astrid.utilities.LegacyTasksXmlExporter;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.GenericDao;
 import com.todoroo.andlib.data.Property;
@@ -32,7 +33,6 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.alarms.Alarm;
 import com.todoroo.astrid.alarms.AlarmDatabase;
-import com.todoroo.astrid.backup.TasksXmlExporter;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.TaskDao;
@@ -42,6 +42,7 @@ import com.todoroo.astrid.rmilk.data.MilkTask;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.utility.Preferences;
 
+@SuppressWarnings("deprecation")
 public class Astrid2To3UpgradeHelper {
 
     @Autowired
@@ -119,13 +120,7 @@ public class Astrid2To3UpgradeHelper {
             dialog = dialogUtilities.progressDialog(context, context.getString(R.string.DLG_wait));
 
         // initiate a backup
-        try {
-            TasksXmlExporter exporter = new TasksXmlExporter(true);
-            exporter.setContext(ContextManager.getContext());
-            exporter.exportTasks(TasksXmlExporter.getExportDirectory());
-        } catch (Exception e) {
-            // unable to create a backup before upgrading :(
-        }
+        legacyBackup();
 
         database.openForWriting();
 
@@ -192,6 +187,19 @@ public class Astrid2To3UpgradeHelper {
 
     // --- database upgrade helpers
 
+    /**
+     * Create a legacy backup file
+     */
+    private void legacyBackup() {
+        try {
+            LegacyTasksXmlExporter exporter = new LegacyTasksXmlExporter(true);
+            exporter.setContext(ContextManager.getContext());
+            exporter.exportTasks(LegacyTasksXmlExporter.getExportDirectory());
+        } catch (Exception e) {
+            // unable to create a backup before upgrading :(
+        }
+    }
+
     protected static final class UpgradeVisitorContainer<TYPE extends AbstractModel> {
         public int columnIndex;
         public Cursor cursor;
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index 633baab74..c752ad979 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -8,8 +8,8 @@ import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
@@ -19,7 +19,6 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.service.ExceptionService.TodorooUncaughtExceptionHandler;
-import com.todoroo.astrid.backup.BackupService;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.reminders.ReminderService;
 import com.todoroo.astrid.utility.Constants;
@@ -104,9 +103,6 @@ public class StartupService {
                 am.setInexactRepeating(AlarmManager.RTC, 0,
                         Constants.WIDGET_UPDATE_INTERVAL, pendingIntent);
 
-                // start backup service
-                BackupService.scheduleService(context);
-
                 database.openForWriting();
                 taskService.cleanup();
             }
diff --git a/astrid/src/com/todoroo/astrid/utility/Preferences.java b/astrid/src/com/todoroo/astrid/utility/Preferences.java
index 08ad4672e..f6780f7e3 100644
--- a/astrid/src/com/todoroo/astrid/utility/Preferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/Preferences.java
@@ -83,7 +83,7 @@ public class Preferences {
         return PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-    // --- preference fetching
+    // --- preference fetching (string)
 
     /** Gets an string value from a string preference. Returns null
      * if the value is not set
@@ -167,6 +167,28 @@ public class Preferences {
         }
     }
 
+    /**
+     * Sets string preference
+     */
+    public static void setString(int keyResource, String newValue) {
+        Context context = ContextManager.getContext();
+        Editor editor = getPrefs(context).edit();
+        editor.putString(context.getString(keyResource), newValue);
+        editor.commit();
+    }
+
+    /**
+     * Sets string preference from integer value
+     */
+    public static void setStringFromInteger(int keyResource, int newValue) {
+        Context context = ContextManager.getContext();
+        Editor editor = getPrefs(context).edit();
+        editor.putString(context.getString(keyResource), Integer.toString(newValue));
+        editor.commit();
+    }
+
+    // --- preference fetching (boolean)
+
     /** Gets a boolean preference (e.g. a CheckBoxPreference setting)
      *
      * @param key
@@ -200,23 +222,31 @@ public class Preferences {
         editor.commit();
     }
 
-    /**
-     * Sets string preference
+    // --- preference fetching (long)
+
+    /** Gets a long preference
+     *
+     * @param key
+     * @param defValue
+     * @return default if value is unset otherwise the value
      */
-    public static void setString(int keyResource, String newValue) {
+    public static long getLong(String key, long defValue) {
         Context context = ContextManager.getContext();
-        Editor editor = getPrefs(context).edit();
-        editor.putString(context.getString(keyResource), newValue);
-        editor.commit();
+        return getPrefs(context).getLong(key, defValue);
     }
 
     /**
-     * Sets string preference from integer value
+     * Sets long preference
+     * @param key
+     * @param value
      */
-    public static void setStringFromInteger(int keyResource, int newValue) {
+    public static void setLong(String key, long value) {
         Context context = ContextManager.getContext();
         Editor editor = getPrefs(context).edit();
-        editor.putString(context.getString(keyResource), Integer.toString(newValue));
+        editor.putLong(key, value);
         editor.commit();
     }
+
+
+
 }
diff --git a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java b/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
index 5cedb25b7..a9bcb45ea 100644
--- a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
+++ b/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
@@ -131,24 +131,24 @@ public class TaskDaoTests extends DatabaseTestCase {
 
         // check due before / after
         cursor = taskDao.query(Query.select(TITLES).where(TaskCriteria.
-                dueBefore(DateUtilities.now())));
+                dueBeforeNow()));
         cursor.moveToNext();
         assertEquals(1, cursor.getCount());
         cursor.close();
         cursor = taskDao.query(Query.select(TITLES).where(TaskCriteria.
-                dueAfter(DateUtilities.now())));
+                dueAfterNow()));
         assertEquals(1, cursor.getCount());
         cursor.close();
 
         // check completed before
         cursor = taskDao.query(Query.select(TITLES).where(TaskCriteria.
-                completedBefore(DateUtilities.now())));
+                completed()));
         assertEquals(1, cursor.getCount());
         cursor.close();
 
         // check is visible
         cursor = taskDao.query(Query.select(TITLES).where(TaskCriteria.
-                isVisible(DateUtilities.now())));
+                isVisible()));
         assertEquals(5, cursor.getCount());
         cursor.close();
     }