From f716f16f401f3c2a7bb496253a29d78c1db51617 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sat, 7 Aug 2010 16:44:43 -0700
Subject: [PATCH] Fix for AST-156 - now we show three categories of tags,
 normal, completed, and all.

---
 .../com/todoroo/astrid/tags/TagFilterExposer.java         | 8 ++++----
 astrid/res/values/strings-tags.xml                        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index b8251c340..a78d16490 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -95,9 +95,9 @@ public class TagFilterExposer extends BroadcastReceiver {
                 filtersBySize);
         tagsCategoryBySize.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags1)).getBitmap();
 
-        FilterCategory tagsCategoryByAlpha = new FilterCategory(context.getString(R.string.tag_FEx_alpha),
+        FilterCategory tagsCategoryAllByAlpha = new FilterCategory(context.getString(R.string.tag_FEx_alpha),
                 filtersByAlpha);
-        tagsCategoryByAlpha.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags1)).getBitmap();
+        tagsCategoryAllByAlpha.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags1)).getBitmap();
 
         FilterCategory tagsCategoryCompleted = new FilterCategory(context.getString(R.string.tag_FEx_completed),
                 filtersCompleted);
@@ -108,8 +108,8 @@ public class TagFilterExposer extends BroadcastReceiver {
         list[0] = tagsHeader;
         list[1] = untagged;
         list[2] = tagsCategoryBySize;
-        list[3] = tagsCategoryByAlpha;
-        list[4] = tagsCategoryCompleted;
+        list[3] = tagsCategoryCompleted;
+        list[4] = tagsCategoryAllByAlpha;
         Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS);
         broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, list);
         context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index b894067f2..5bb965056 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -23,14 +23,14 @@
   <string name="tag_FEx_header">Tags</string>
   
   <!-- filter header for tags, sorted by size -->
-  <string name="tag_FEx_by_size">By Size</string>
-  
-  <!-- filter header for tags, sorted by name -->
-  <string name="tag_FEx_alpha">Alphabetical</string>
+  <string name="tag_FEx_by_size">Active</string>
   
   <!-- filter header for tags of completed tasks -->
   <string name="tag_FEx_completed">Completed</string>
   
+  <!-- filter header for all tags, sorted by name -->
+  <string name="tag_FEx_alpha">All Tags</string>
+  
   <!-- filter for untagged tasks -->
   <string name="tag_FEx_untagged">Untagged</string>