Fix for AST-156 - now we show three categories of tags, normal, completed, and all.

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);

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>