From 28d05d632508604c569931954df96ba3ce1e34a0 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 7 May 2012 20:01:18 -0700
Subject: [PATCH 01/13] Started altering tag service to filter out emergent
 tags

---
 .../astrid/actfm/EditPeopleControlSet.java    |  2 +-
 .../astrid/actfm/sync/ActFmSyncService.java   |  2 +-
 .../todoroo/astrid/tags/TagCaseMigrator.java  |  2 +-
 .../tags/TagCustomFilterCriteriaExposer.java  |  2 +-
 .../todoroo/astrid/tags/TagDetailExposer.java |  2 +-
 .../com/todoroo/astrid/tags/TagService.java   | 48 +++++++++++++++----
 .../todoroo/astrid/tags/TagsControlSet.java   |  2 +-
 .../astrid/provider/Astrid2TaskProvider.java  |  4 +-
 8 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index dd5c7eeb4..908e08f96 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -241,7 +241,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 @Override
                 public void run() {
                     ArrayList<JSONObject> collaborators = new ArrayList<JSONObject>();
-                    TodorooCursor<Metadata> tags = TagService.getInstance().getTags(task.getId());
+                    TodorooCursor<Metadata> tags = TagService.getInstance().getTags(task.getId(), true);
                     try {
                         Metadata metadata = new Metadata();
                         for(tags.moveToFirst(); !tags.isAfterLast(); tags.moveToNext()) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index f71c8256d..79c4f3ccc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -394,7 +394,7 @@ public final class ActFmSyncService {
         }
 
         if(Flags.checkAndClear(Flags.TAGS_CHANGED) || newlyCreated) {
-            TodorooCursor<Metadata> cursor = TagService.getInstance().getTags(task.getId());
+            TodorooCursor<Metadata> cursor = TagService.getInstance().getTags(task.getId(), false);
             try {
                 if(cursor.getCount() == 0) {
                     params.add("tags");
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java
index 48fa80430..c29998099 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java
@@ -38,7 +38,7 @@ public class TagCaseMigrator {
     public void performTagCaseMigration(@SuppressWarnings("unused") Context context) {
         if (!Preferences.getBoolean(PREF_CASE_MIGRATION_PERFORMED, false)) {
             TagService.Tag[] allTagData = TagService.getInstance().getGroupedTags(
-                    TagService.GROUPED_TAGS_BY_ALPHA, Criterion.all);
+                    TagService.GROUPED_TAGS_BY_ALPHA, Criterion.all, false);
 
             boolean shouldShowDialog = false;
             for (int i = 0; i < allTagData.length - 1; i++) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
index be9d7d32d..ebb821d15 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
@@ -35,7 +35,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
         // built in criteria: tags
         {
             TagService.Tag[] tags = TagService.getInstance().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE,
-                            TaskDao.TaskCriteria.activeAndVisible());
+                            TaskDao.TaskCriteria.activeAndVisible(), false);
             String[] tagNames = new String[tags.length];
             for(int i = 0; i < tags.length; i++)
                 tagNames[i] = tags[i].tag;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
index 3d890d606..70ef269e0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
@@ -37,7 +37,7 @@ public class TagDetailExposer extends BroadcastReceiver {
     }
 
     public String getTaskDetails(long id) {
-        String tagList = TagService.getInstance().getTagsAsString(id);
+        String tagList = TagService.getInstance().getTagsAsString(id, false);
         if(tagList.length() == 0)
             return null;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index e65dc142e..45482efdd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -193,10 +193,15 @@ public final class TagService {
      * @param activeStatus criterion for specifying completed or uncompleted
      * @return empty array if no tags, otherwise array
      */
-    public Tag[] getGroupedTags(Order order, Criterion activeStatus) {
+    public Tag[] getGroupedTags(Order order, Criterion activeStatus, boolean includeEmergent) {
+        Criterion criterion;
+        if (includeEmergent)
+            criterion = Criterion.and(activeStatus, MetadataCriteria.withKey(KEY));
+        else
+            criterion = Criterion.and(activeStatus, MetadataCriteria.withKey(KEY), Criterion.not(TAG.in(getEmergentTags())));
         Query query = Query.select(TAG, REMOTE_ID, COUNT).
             join(Join.inner(Task.TABLE, Metadata.TASK.eq(Task.ID))).
-            where(Criterion.and(activeStatus, MetadataCriteria.withKey(KEY))).
+            where(criterion).
             orderBy(order).groupBy(TAG);
         TodorooCursor<Metadata> cursor = metadataDao.query(query);
         try {
@@ -211,15 +216,38 @@ public final class TagService {
         }
     }
 
+    private String[] getEmergentTags() {
+        TodorooCursor<TagData> emergent = tagDataService.query(Query.select(TagData.NAME)
+                .where(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_EMERGENT).gt(0)));
+        try {
+            String[] tags = new String[emergent.getCount()];
+            TagData data = new TagData();
+            for (int i = 0; i < emergent.getCount(); i++) {
+                emergent.moveToPosition(i);
+                data.readFromCursor(emergent);
+                tags[i] = data.getValue(TagData.NAME);
+            }
+            return tags;
+        } finally {
+            emergent.close();
+        }
+    }
+
     /**
      * Return tags on the given task
      *
      * @param taskId
      * @return cursor. PLEASE CLOSE THE CURSOR!
      */
-    public TodorooCursor<Metadata> getTags(long taskId) {
-        Query query = Query.select(TAG, REMOTE_ID).where(Criterion.and(MetadataCriteria.withKey(KEY),
-                MetadataCriteria.byTask(taskId))).orderBy(Order.asc(Functions.upper(TAG)));
+    public TodorooCursor<Metadata> getTags(long taskId, boolean includeEmergent) {
+        Criterion criterion;
+        if (includeEmergent)
+            criterion = Criterion.and(MetadataCriteria.withKey(KEY),
+                    MetadataCriteria.byTask(taskId));
+        else
+            criterion = Criterion.and(MetadataCriteria.withKey(KEY),
+                    MetadataCriteria.byTask(taskId), Criterion.not(TAG.in(getEmergentTags())));
+        Query query = Query.select(TAG, REMOTE_ID).where(criterion).orderBy(Order.asc(Functions.upper(TAG)));
         return metadataDao.query(query);
     }
 
@@ -229,8 +257,8 @@ public final class TagService {
      * @param taskId
      * @return empty string if no tags, otherwise string
      */
-    public String getTagsAsString(long taskId) {
-        return getTagsAsString(taskId, ", ");
+    public String getTagsAsString(long taskId, boolean includeEmergent) {
+        return getTagsAsString(taskId, ", ", includeEmergent);
     }
 
     /**
@@ -239,9 +267,9 @@ public final class TagService {
      * @param taskId
      * @return empty string if no tags, otherwise string
      */
-    public String getTagsAsString(long taskId, String separator) {
+    protected String getTagsAsString(long taskId, String separator, boolean includeEmergent) {
         StringBuilder tagBuilder = new StringBuilder();
-        TodorooCursor<Metadata> tags = getTags(taskId);
+        TodorooCursor<Metadata> tags = getTags(taskId, includeEmergent);
         try {
             int length = tags.getCount();
             Metadata metadata = new Metadata();
@@ -285,7 +313,7 @@ public final class TagService {
         HashMap<String, Tag> tags = new HashMap<String, Tag>();
 
         Tag[] tagsByAlpha = getGroupedTags(TagService.GROUPED_TAGS_BY_ALPHA,
-                TaskCriteria.activeAndVisible());
+                TaskCriteria.activeAndVisible(), false);
         for(Tag tag : tagsByAlpha)
             if(!TextUtils.isEmpty(tag.tag))
                 tags.put(tag.tag, tag);
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
index d538975c6..c1334d12a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@@ -223,7 +223,7 @@ public final class TagsControlSet extends PopupControlSet {
     public void readFromTask(Task task) {
         super.readFromTask(task);
         if(model.getId() != AbstractModel.NO_ID) {
-            TodorooCursor<Metadata> cursor = tagService.getTags(model.getId());
+            TodorooCursor<Metadata> cursor = tagService.getTags(model.getId(), false);
             LinkedHashSet<String> tags = new LinkedHashSet<String>(cursor.getCount());
             try {
                 for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
index ca5345d6a..5b4fc9f01 100644
--- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
@@ -138,7 +138,7 @@ public class Astrid2TaskProvider extends ContentProvider {
 	public Cursor getTags() {
 
 		Tag[] tags = TagService.getInstance().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE,
-		        Criterion.all);
+		        Criterion.all, true);
 
 		MatrixCursor ret = new MatrixCursor(TAGS_FIELD_LIST);
 
@@ -195,7 +195,7 @@ public class Astrid2TaskProvider extends ContentProvider {
     			task.readFromCursor(cursor);
 
     			StringBuilder taskTags = new StringBuilder();
-    			TodorooCursor<Metadata> tagCursor = TagService.getInstance().getTags(task.getId());
+    			TodorooCursor<Metadata> tagCursor = TagService.getInstance().getTags(task.getId(), true);
     			try {
     			    for(tagCursor.moveToFirst(); !tagCursor.isAfterLast(); tagCursor.moveToNext())
     			        taskTags.append(tagCursor.get(TagService.TAG)).append(TAG_SEPARATOR);

From 6060b217574fca1a55ce17bf679c9ca9c1798c06 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 7 May 2012 20:38:57 -0700
Subject: [PATCH 02/13] Fixed a bug in StringProperty.in(String[]) that makes
 hiding emergent tags work

---
 api/src/com/todoroo/andlib/data/Property.java | 22 ++++++++++++
 api/src/com/todoroo/andlib/sql/Criterion.java |  2 +-
 .../com/todoroo/andlib/sql/SqlConstants.java  | 36 +++++++++----------
 .../com/todoroo/astrid/tags/TagService.java   |  2 +-
 4 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/api/src/com/todoroo/andlib/data/Property.java b/api/src/com/todoroo/andlib/data/Property.java
index b1526e629..40bfb08f7 100644
--- a/api/src/com/todoroo/andlib/data/Property.java
+++ b/api/src/com/todoroo/andlib/data/Property.java
@@ -5,7 +5,14 @@
  */
 package com.todoroo.andlib.data;
 
+import static com.todoroo.andlib.sql.SqlConstants.COMMA;
+import static com.todoroo.andlib.sql.SqlConstants.LEFT_PARENTHESIS;
+import static com.todoroo.andlib.sql.SqlConstants.RIGHT_PARENTHESIS;
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
+import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Field;
+import com.todoroo.andlib.sql.Operator;
 
 /**
  * Property represents a typed column in a database.
@@ -150,6 +157,21 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
                 PropertyVisitor<RETURN, PARAMETER> visitor, PARAMETER data) {
             return visitor.visitString(this, data);
         }
+
+        public Criterion in(final String[] value) {
+            final Field field = this;
+            return new Criterion(Operator.in) {
+
+                @Override
+                protected void populate(StringBuilder sb) {
+                    sb.append(field).append(SPACE).append(Operator.in).append(SPACE).append(LEFT_PARENTHESIS).append(SPACE);
+                    for (String s : value) {
+                        sb.append("\"").append(s.toString()).append("\"").append(COMMA);
+                    }
+                    sb.deleteCharAt(sb.length() - 1).append(RIGHT_PARENTHESIS);
+                }
+            };
+        }
     }
 
     /**
diff --git a/api/src/com/todoroo/andlib/sql/Criterion.java b/api/src/com/todoroo/andlib/sql/Criterion.java
index 5acdc6535..9059bc8f1 100644
--- a/api/src/com/todoroo/andlib/sql/Criterion.java
+++ b/api/src/com/todoroo/andlib/sql/Criterion.java
@@ -11,7 +11,7 @@ import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 public abstract class Criterion {
     protected final Operator operator;
 
-    Criterion(Operator operator) {
+    public Criterion(Operator operator) {
         this.operator = operator;
     }
 
diff --git a/api/src/com/todoroo/andlib/sql/SqlConstants.java b/api/src/com/todoroo/andlib/sql/SqlConstants.java
index fa9d647fc..4739acfeb 100644
--- a/api/src/com/todoroo/andlib/sql/SqlConstants.java
+++ b/api/src/com/todoroo/andlib/sql/SqlConstants.java
@@ -2,24 +2,24 @@ package com.todoroo.andlib.sql;
 
 @SuppressWarnings("nls")
 public final class SqlConstants {
-    static final String SELECT = "SELECT";
-    static final String DISTINCT = "DISTINCT";
-    static final String SPACE = " ";
-    static final String AS = "AS";
-    static final String COMMA = ",";
-    static final String FROM = "FROM";
-    static final String ON = "ON";
-    static final String JOIN = "JOIN";
-    static final String ALL = "*";
-    static final String LEFT_PARENTHESIS = "(";
-    static final String RIGHT_PARENTHESIS = ")";
-    static final String AND = "AND";
-    static final String BETWEEN = "BETWEEN";
-    static final String LIKE = "LIKE";
-    static final String OR = "OR";
-    static final String ORDER_BY = "ORDER BY";
-    static final String GROUP_BY = "GROUP BY";
-    static final String WHERE = "WHERE";
+    public static final String SELECT = "SELECT";
+    public static final String DISTINCT = "DISTINCT";
+    public static final String SPACE = " ";
+    public static final String AS = "AS";
+    public static final String COMMA = ",";
+    public static final String FROM = "FROM";
+    public static final String ON = "ON";
+    public static final String JOIN = "JOIN";
+    public static final String ALL = "*";
+    public static final String LEFT_PARENTHESIS = "(";
+    public static final String RIGHT_PARENTHESIS = ")";
+    public static final String AND = "AND";
+    public static final String BETWEEN = "BETWEEN";
+    public static final String LIKE = "LIKE";
+    public static final String OR = "OR";
+    public static final String ORDER_BY = "ORDER BY";
+    public static final String GROUP_BY = "GROUP BY";
+    public static final String WHERE = "WHERE";
     public static final String EXISTS = "EXISTS";
     public static final String NOT = "NOT";
     public static final String LIMIT = "LIMIT";
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index 45482efdd..12eb7339a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -325,7 +325,7 @@ public final class TagService {
                 tagData.readFromCursor(cursor);
                 String tagName = tagData.getValue(TagData.NAME).trim();
                 Tag tag = new Tag(tagData);
-                if(tagData.getValue(TagData.DELETION_DATE) > 0) {
+                if(tagData.getValue(TagData.DELETION_DATE) > 0 || tagData.getFlag(TagData.FLAGS, TagData.FLAG_EMERGENT)) {
                     tags.remove(tagName);
                     continue;
                 }

From 0ed664a6638f7e60d82f6090308af415947652f2 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 8 May 2012 16:57:37 -0700
Subject: [PATCH 03/13] Commit all the things--mostly working people view

---
 api/src/com/todoroo/astrid/data/User.java     |   8 ++
 astrid/AndroidManifest.xml                    |  10 ++
 .../todoroo/astrid/core/PluginServices.java   |   8 ++
 .../astrid/people/PeopleFilterAdapter.java    |  38 ++++++
 .../astrid/people/PeopleFilterExposer.java    | 113 ++++++++++++++++++
 .../astrid/people/PeopleListFragment.java     |  20 ++++
 .../astrid/people/PeopleViewActivity.java     |  80 +++++++++++++
 .../astrid/people/PersonViewFragment.java     |  23 ++++
 astrid/res/layout/header_people_view.xml      |  76 ++++++++++++
 astrid/res/layout/people_list_fragment.xml    |  20 ++++
 .../layout/people_view_wrapper_activity.xml   |   8 ++
 astrid/res/layout/task_list_body_person.xml   |  11 ++
 .../astrid/activity/FilterListFragment.java   |  40 ++++---
 .../astrid/activity/TaskListActivity.java     |  61 ++++++++--
 .../astrid/activity/TaskListFragment.java     |   4 +-
 .../todoroo/astrid/adapter/FilterAdapter.java |   2 +-
 .../astrid/service/StartupService.java        |   1 +
 .../todoroo/astrid/ui/MainMenuPopover.java    |  12 +-
 18 files changed, 502 insertions(+), 33 deletions(-)
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
 create mode 100644 astrid/res/layout/header_people_view.xml
 create mode 100644 astrid/res/layout/people_list_fragment.xml
 create mode 100644 astrid/res/layout/people_view_wrapper_activity.xml
 create mode 100644 astrid/res/layout/task_list_body_person.xml

diff --git a/api/src/com/todoroo/astrid/data/User.java b/api/src/com/todoroo/astrid/data/User.java
index 0d6d6e2cc..f8cf69c82 100644
--- a/api/src/com/todoroo/astrid/data/User.java
+++ b/api/src/com/todoroo/astrid/data/User.java
@@ -8,6 +8,7 @@ package com.todoroo.astrid.data;
 
 import android.content.ContentValues;
 import android.net.Uri;
+import android.text.TextUtils;
 
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
@@ -91,6 +92,13 @@ public final class User extends RemoteModel {
         super.readPropertiesFromCursor(cursor);
     }
 
+    public String getDisplayName() {
+        String name = getValue(NAME);
+        if (!TextUtils.isEmpty(name))
+            return name;
+        return getValue(EMAIL);
+    }
+
     @Override
     public long getId() {
         return getIdHelper(ID);
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index fa56190d6..91e447e20 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -320,6 +320,16 @@
     <activity android:name="com.todoroo.astrid.tags.TagFilterExposer$DeleteTagActivity" android:theme="@style/Theme.FullTransparent" />
     <activity android:name="com.todoroo.astrid.tags.TagFilterExposer$RenameTagActivity" android:theme="@style/Theme.FullTransparent" />
 
+    <!-- People view -->
+    <receiver android:name="com.todoroo.astrid.people.PeopleFilterExposer">
+        <intent-filter>
+            <action android:name="com.timsu.astrid.REQUEST_PEOPLE_FILTERS"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+        </intent-filter>
+    </receiver>
+    <activity android:name="com.todoroo.astrid.people.PeopleViewActivity"
+              android:windowSoftInputMode="stateHidden|adjustResize"/>
+    
     <!-- alarms -->
     <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
       <intent-filter>
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
index b366713a8..ff50eabd6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
@@ -8,6 +8,7 @@ import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.dao.StoreObjectDao;
+import com.todoroo.astrid.dao.UserDao;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.service.AddOnService;
 import com.todoroo.astrid.service.AstridDependencyInjector;
@@ -44,6 +45,9 @@ public final class PluginServices {
     @Autowired
     StoreObjectDao storeObjectDao;
 
+    @Autowired
+    UserDao userDao;
+
     private static PluginServices instance;
 
     static {
@@ -86,6 +90,10 @@ public final class PluginServices {
         return getInstance().storeObjectDao;
     }
 
+    public static UserDao getUserDao() {
+        return getInstance().userDao;
+    }
+
     // -- helpers
 
     /**
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java
new file mode 100644
index 000000000..55147ed6b
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java
@@ -0,0 +1,38 @@
+package com.todoroo.astrid.people;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.widget.ListView;
+
+import com.todoroo.astrid.adapter.FilterAdapter;
+import com.todoroo.astrid.utility.Constants;
+
+public class PeopleFilterAdapter extends FilterAdapter {
+
+    public static final String BROADCAST_REQUEST_PEOPLE_FILTERS = Constants.PACKAGE + ".REQUEST_PEOPLE_FILTERS"; //$NON-NLS-1$
+    public static final String BROADCAST_SEND_PEOPLE_FILTERS = Constants.PACKAGE + ".SEND_PEOPLE_FILTERS"; //$NON-NLS-1$
+
+    public PeopleFilterAdapter(Activity activity, ListView listView,
+            int rowLayout, boolean skipIntentFilters) {
+        super(activity, listView, rowLayout, skipIntentFilters);
+    }
+
+    @Override
+    public void getLists() {
+        Intent broadcastIntent = new Intent(BROADCAST_REQUEST_PEOPLE_FILTERS);
+        activity.sendBroadcast(broadcastIntent);
+    }
+
+    @Override
+    public void registerRecevier() {
+        IntentFilter peopleFilter = new IntentFilter(BROADCAST_SEND_PEOPLE_FILTERS);
+        activity.registerReceiver(filterReceiver, peopleFilter);
+        getLists();
+    }
+
+    @Override
+    public void unregisterRecevier() {
+        activity.unregisterReceiver(filterReceiver);
+    }
+}
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
new file mode 100644
index 000000000..859430ced
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
@@ -0,0 +1,113 @@
+package com.todoroo.astrid.people;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Field;
+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.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.api.FilterWithCustomIntent;
+import com.todoroo.astrid.api.FilterWithUpdate;
+import com.todoroo.astrid.core.PluginServices;
+import com.todoroo.astrid.data.Metadata;
+import com.todoroo.astrid.data.TagData;
+import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.data.User;
+import com.todoroo.astrid.tags.TagService;
+
+public class PeopleFilterExposer extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        FilterListItem[] listAsArray = prepareFilters(context);
+
+        Intent broadcastIntent = new Intent(PeopleFilterAdapter.BROADCAST_SEND_PEOPLE_FILTERS);
+        broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, listAsArray);
+        broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, "people"); //$NON-NLS-1$
+        context.sendBroadcast(broadcastIntent);
+    }
+
+    private FilterListItem[] prepareFilters(Context context) {
+        TodorooCursor<User> users = PluginServices.getUserDao().query(Query.select(User.PROPERTIES)
+                .orderBy(Order.asc(User.NAME), Order.asc(User.EMAIL)));
+        try {
+            FilterListItem[] items = new FilterListItem[users.getCount()];
+            User user = new User();
+            int i = 0;
+            for (users.moveToFirst(); !users.isAfterLast(); users.moveToNext()) {
+                user.readFromCursor(users);
+                Filter currFilter = filterFromUserData(user);
+                items[i] = currFilter;
+                i++;
+            }
+            return items;
+        } finally {
+            users.close();
+        }
+    }
+
+    @SuppressWarnings("nls")
+    public static FilterWithCustomIntent filterFromUserData(User user) {
+        String email = user.getValue(User.EMAIL);
+        String[] tags;
+
+        TodorooCursor<TagData> tagsWithUser = PluginServices.getTagDataService().query(Query.select(TagData.NAME)
+                .where(Criterion.or(
+                        TagData.MEMBERS.like("%" + email + "%"),
+                        TagData.USER.like("%" + email + "%"),
+                        TagData.USER_ID.eq(user.getId()))));
+        try {
+            if (tagsWithUser.getCount() == 0) {
+                tags = new String[1];
+                tags[0] = "\"\"";
+            } else {
+                tags = new String[tagsWithUser.getCount()];
+                int i = 0;
+                TagData curr = new TagData();
+                for (tagsWithUser.moveToFirst(); !tagsWithUser.isAfterLast(); tagsWithUser.moveToNext()) {
+                    curr.readFromCursor(tagsWithUser);
+                    tags[i] = "\"" + curr.getValue(TagData.NAME) + "\"";
+                    i++;
+                }
+            }
+        } finally {
+            tagsWithUser.close();
+        }
+
+        String title = user.getDisplayName();
+        QueryTemplate userTemplate = new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"),
+                Criterion.and(Task.ID.eq(Field.field("mtags." + Metadata.TASK.name)),
+                        Field.field("mtags." + Metadata.KEY.name).eq(TagService.KEY),
+                        Field.field("mtags." + TagService.TAG.name).in(tags),
+                        Criterion.or(Task.USER.like("%" + email + "%"),
+                                Task.USER_ID.eq(user.getValue(User.REMOTE_ID))))));
+
+        FilterWithUpdate filter = new FilterWithUpdate(title, title, userTemplate, null);
+
+        filter.customTaskList = new ComponentName(ContextManager.getContext(), PersonViewFragment.class);
+
+        ContentValues values = new ContentValues();
+        values.put(Task.USER_ID.name, user.getValue(User.REMOTE_ID));
+        filter.valuesForNewTasks = values;
+
+        String imageUrl = user.getValue(User.PICTURE);
+        filter.imageUrl = imageUrl;
+
+        Bundle extras = new Bundle();
+        extras.putLong(PersonViewFragment.EXTRA_USER_ID_LOCAL, user.getId());
+        filter.customExtras = extras;
+
+        return filter;
+    }
+}
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java
new file mode 100644
index 000000000..db7f38e8c
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java
@@ -0,0 +1,20 @@
+package com.todoroo.astrid.people;
+
+import android.app.Activity;
+
+import com.timsu.astrid.R;
+import com.todoroo.astrid.activity.FilterListFragment;
+import com.todoroo.astrid.adapter.FilterAdapter;
+
+public class PeopleListFragment extends FilterListFragment {
+
+    @Override
+    protected FilterAdapter instantiateAdapter() {
+        return new PeopleFilterAdapter(getActivity(), null, R.layout.filter_adapter_row, false);
+    }
+
+    @Override
+    protected int getLayout(Activity activity) {
+        return R.layout.people_list_fragment;
+    }
+}
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java
new file mode 100644
index 000000000..27272f3b4
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java
@@ -0,0 +1,80 @@
+package com.todoroo.astrid.people;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.timsu.astrid.R;
+import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.astrid.activity.FilterListFragment;
+import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.activity.TaskListFragment;
+import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.api.FilterWithUpdate;
+import com.todoroo.astrid.helper.AsyncImageView;
+import com.todoroo.astrid.ui.MainMenuPopover;
+
+public class PeopleViewActivity extends TaskListActivity {
+
+    private AsyncImageView imageView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        imageView = (AsyncImageView) findViewById(R.id.person_image);
+        imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+    }
+
+    @Override
+    protected int getContentView() {
+        return R.layout.people_view_wrapper_activity;
+    }
+
+    @Override
+    protected Filter getDefaultFilter() {
+        // TODO More suitable default
+        return super.getDefaultFilter();
+    }
+
+    @Override
+    protected Class<? extends FilterListFragment> getFilterListClass() {
+        return PeopleListFragment.class;
+    }
+
+    @Override
+    protected int getHeaderView() {
+        return R.layout.header_people_view;
+    }
+
+    @Override
+    public boolean onFilterItemClicked(FilterListItem item) {
+        boolean result = super.onFilterItemClicked(item);
+        if (result && item instanceof FilterWithUpdate)
+            imageView.setUrl(((FilterWithUpdate) item).imageUrl);
+        else
+            imageView.setUrl(null);
+        return result;
+    }
+
+    private static final int[] FORBIDDEN_MENU_ITEMS = {
+        TaskListFragment.MENU_NEW_FILTER_ID,
+        TaskListFragment.MENU_ADDONS_ID,
+        MainMenuPopover.MAIN_MENU_ITEM_FRIENDS
+    };
+
+    @Override
+    public boolean shouldAddMenuItem(int itemId) {
+        return AndroidUtilities.indexOf(FORBIDDEN_MENU_ITEMS, itemId) < 0;
+    }
+
+    @Override
+    public void mainMenuItemSelected(int item, Intent customIntent) {
+        if (item == MainMenuPopover.MAIN_MENU_ITEM_LISTS) {
+            finish();
+            return;
+        }
+
+        super.mainMenuItemSelected(item, customIntent);
+    }
+}
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
new file mode 100644
index 000000000..05056c817
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -0,0 +1,23 @@
+package com.todoroo.astrid.people;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.timsu.astrid.R;
+import com.todoroo.astrid.activity.TaskListFragment;
+
+public class PersonViewFragment extends TaskListFragment {
+
+    public static final String EXTRA_USER_ID_LOCAL = "user_local_id"; //$NON-NLS-1$
+
+    @Override
+    protected View getListBody(ViewGroup root) {
+        ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_person, root, false);
+
+        View taskListView = super.getListBody(parent);
+        parent.addView(taskListView);
+
+        return parent;
+    }
+
+}
diff --git a/astrid/res/layout/header_people_view.xml b/astrid/res/layout/header_people_view.xml
new file mode 100644
index 000000000..b25ced504
--- /dev/null
+++ b/astrid/res/layout/header_people_view.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+    
+    <ImageView
+        android:id="@+id/main_menu"
+        android:layout_width="51dip"
+        android:layout_height="fill_parent"
+        android:src="?attr/asMainMenu"
+        android:scaleType="fitCenter"/>
+    
+    <View
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="-1px"
+        android:background="?attr/asSeparatorBackground"
+        android:layout_marginBottom="4dip"
+        android:layout_marginTop="4dip"/>
+        
+        
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical">
+        <RelativeLayout 
+            android:id="@+id/lists_nav"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_margin="5dip"
+            android:paddingRight="5dip"
+            android:paddingLeft="5dip"
+            android:gravity="center_vertical">
+            
+            <TextView
+                android:id="@+id/list_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="@string/BFE_Active"
+                android:singleLine="true"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                style="@style/TextAppearance.ActionBar_ListsHeader"/>
+            
+            <ImageView
+                android:id="@+id/list_disclosure_arrow"
+                android:layout_width="12dip"
+                android:layout_height="12dip"
+                android:layout_marginLeft="10dip" 
+                android:layout_toRightOf="@id/list_title"
+                android:layout_alignBottom="@id/list_title"
+                android:src="?attr/asListsDisclosure"
+                android:scaleType="fitCenter"/>
+        
+        </RelativeLayout>
+    </LinearLayout>
+    
+    <com.todoroo.astrid.helper.AsyncImageView 
+        android:id="@+id/person_image"
+        android:layout_width="51dip"
+        android:layout_height="fill_parent"
+        android:scaleType="centerCrop"/>
+    
+    <Button 
+        android:id="@+id/comments"
+        android:layout_width="51dip"
+        android:layout_height="fill_parent"
+        android:background="?attr/asCommentButtonImg"
+        android:textColor="@android:color/white"
+        android:paddingBottom="6dip"
+        android:visibility="gone"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/people_list_fragment.xml b/astrid/res/layout/people_list_fragment.xml
new file mode 100644
index 000000000..32fc8e66e
--- /dev/null
+++ b/astrid/res/layout/people_list_fragment.xml
@@ -0,0 +1,20 @@
+<?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="?attr/asListPopoverBg"
+    android:orientation="vertical">
+
+
+    <!-- List -->
+    <ListView android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="370dip"
+        android:layout_alignParentTop="true"
+        android:scrollbars="vertical"
+        android:divider="@android:color/transparent"
+        android:cacheColorHint="#00000000"/>
+        
+</LinearLayout>
+    
diff --git a/astrid/res/layout/people_view_wrapper_activity.xml b/astrid/res/layout/people_view_wrapper_activity.xml
new file mode 100644
index 000000000..7f3cc135c
--- /dev/null
+++ b/astrid/res/layout/people_view_wrapper_activity.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/Content"
+    android:id="@+id/tasklist_fragment_container">
+</FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_list_body_person.xml b/astrid/res/layout/task_list_body_person.xml
new file mode 100644
index 000000000..27b5e4946
--- /dev/null
+++ b/astrid/res/layout/task_list_body_person.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:layout_weight="100">
+  
+  <!-- List body goes here -->
+    
+</LinearLayout>
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
index e3b094947..e3d4e8feb 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
@@ -118,14 +118,18 @@ public class FilterListFragment extends ListFragment {
         // Check that the container activity has implemented the callback interface
         try {
             mListener = (OnFilterItemClickedListener) activity;
-            adapter = new FilterAdapter(getActivity(), null,
-                    R.layout.filter_adapter_row, false);
+            adapter = instantiateAdapter();
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString()
                     + " must implement OnFilterItemClickedListener"); //$NON-NLS-1$
         }
     }
 
+    protected FilterAdapter instantiateAdapter() {
+        return new FilterAdapter(getActivity(), null,
+                R.layout.filter_adapter_row, false);
+    }
+
     /* (non-Javadoc)
      * @see com.todoroo.astrid.fragment.ExpandableListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)
      */
@@ -133,15 +137,18 @@ public class FilterListFragment extends ListFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         Activity activity = getActivity();
-        int layout;
-        if (AndroidUtilities.isTabletSized(activity))
-            layout = R.layout.filter_list_activity_3pane;
-        else
-            layout = R.layout.filter_list_activity;
+        int layout = getLayout(activity);
         ViewGroup parent = (ViewGroup) activity.getLayoutInflater().inflate(layout, container, false);
         return parent;
     }
 
+    protected int getLayout(Activity activity) {
+        if (AndroidUtilities.isTabletSized(activity))
+            return R.layout.filter_list_activity_3pane;
+        else
+            return R.layout.filter_list_activity;
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -152,15 +159,16 @@ public class FilterListFragment extends ListFragment {
         //ImageView backButton = (ImageView) getView().findViewById(R.id.back);
         newListButton = getView().findViewById(R.id.new_list_button);
 
-        newListButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = TagsPlugin.newTagDialog(getActivity());
-                getActivity().startActivityForResult(intent, REQUEST_NEW_LIST);
-                if (!AndroidUtilities.isTabletSized(getActivity()))
-                    AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out);
-            }
-        });
+        if (newListButton != null)
+            newListButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = TagsPlugin.newTagDialog(getActivity());
+                    getActivity().startActivityForResult(intent, REQUEST_NEW_LIST);
+                    if (!AndroidUtilities.isTabletSized(getActivity()))
+                        AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out);
+                }
+            });
 
         AstridActivity activity = (AstridActivity) getActivity();
         if (activity.getFragmentLayout() > AstridActivity.LAYOUT_SINGLE) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 2dc0311cd..4e873be81 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -44,6 +44,7 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.CoreFilterExposer;
 import com.todoroo.astrid.core.CustomFilterExposer;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.people.PeopleViewActivity;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.ThemeService;
@@ -147,19 +148,15 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         super.onCreate(savedInstanceState);
         DependencyInjectionService.getInstance().inject(this);
 
-        if (AndroidUtilities.isTabletSized(this)) {
-            setContentView(R.layout.task_list_wrapper_activity_3pane);
-        } else if (Preferences.getIntegerFromString(R.string.p_swipe_lists_performance_key, 3) == 0) {
-            setContentView(R.layout.task_list_wrapper_activity_no_swipe);
-        } else {
-            setContentView(R.layout.task_list_wrapper_activity);
+        int contentView = getContentView();
+        if (contentView == R.layout.task_list_wrapper_activity)
             swipeEnabled = true;
-        }
+        setContentView(getContentView());
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
         actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setCustomView(R.layout.header_nav_views);
+        actionBar.setCustomView(getHeaderView());
 
         listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav);
         listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
@@ -191,7 +188,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         }
 
         if (savedFilter == null)
-            savedFilter = CoreFilterExposer.buildInboxFilter(getResources());
+            savedFilter = getDefaultFilter();
 
 
         if (swipeIsEnabled()) {
@@ -219,6 +216,23 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         abTestEventReportingService.trackUserRetention();
     }
 
+    protected int getHeaderView() {
+        return R.layout.header_nav_views;
+    }
+
+    protected int getContentView() {
+        if (AndroidUtilities.isTabletSized(this))
+            return R.layout.task_list_wrapper_activity_3pane;
+        else if (Preferences.getIntegerFromString(R.string.p_swipe_lists_performance_key, 3) == 0)
+            return R.layout.task_list_wrapper_activity_no_swipe;
+        else
+            return R.layout.task_list_wrapper_activity;
+    }
+
+    protected Filter getDefaultFilter() {
+        return CoreFilterExposer.buildInboxFilter(getResources());
+    }
+
     private boolean swipeIsEnabled() {
         return fragmentLayout == LAYOUT_SINGLE && swipeEnabled;
     }
@@ -271,10 +285,26 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             actionBar.setDisplayHomeAsUpEnabled(true);
             listsNav.setOnClickListener(popupMenuClickListener);
             createListsPopover();
-            setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class, true));
+            setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
+                    getFilterListClass(), true));
         }
     }
 
+    protected Class<? extends FilterListFragment> getFilterListClass() {
+        return FilterListFragment.class;
+    }
+
+//    private void togglePeopleView(boolean peopleMode) {
+//        if (fragmentLayout != LAYOUT_SINGLE) {
+//            if (peopleMode)
+//                setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, R.id.filterlist_fragment_container,
+//                        PeopleListFragment.class, false);
+//            else
+//                setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
+//                        R.id.filterlist_fragment_container, FilterListFragment.class, false);
+//        }
+//    }
+
     private void createListsPopover() {
         listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
         listsPopover.setOnDismissListener(new OnDismissListener() {
@@ -320,8 +350,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         else
             layout = R.layout.main_menu_popover;
 
-        mainMenuPopover = new MainMenuPopover(this, layout, (fragmentLayout != LAYOUT_SINGLE));
-        mainMenuPopover.setMenuListener(this);
+        mainMenuPopover = new MainMenuPopover(this, layout, (fragmentLayout != LAYOUT_SINGLE), this);
         mainMenuPopover.setOnDismissListener(new OnDismissListener() {
             @Override
             public void onDismiss() {
@@ -640,6 +669,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         getIntent().putExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT); // Only report source once
     }
 
+    @Override
+    public boolean shouldAddMenuItem(int itemId) {
+        return true;
+    }
+
     @Override
     public void mainMenuItemSelected(int item, Intent customIntent) {
         TaskListFragment tlf = getTaskListFragment();
@@ -651,7 +685,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             onSearchRequested();
             return;
         case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
-            // Doesn't exist yet
+            Intent peopleIntent = new Intent(this, PeopleViewActivity.class);
+            startActivity(peopleIntent);
             return;
         case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
             // Doesn't exist yet
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 1cb993364..f24e4308c 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -125,12 +125,12 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
 
     // --- menu codes
 
-    protected static final int MENU_ADDONS_ID = R.string.TLA_menu_addons;
+    public static final int MENU_ADDONS_ID = R.string.TLA_menu_addons;
     protected static final int MENU_SETTINGS_ID = R.string.TLA_menu_settings;
     protected static final int MENU_SORT_ID = R.string.TLA_menu_sort;
     protected static final int MENU_SYNC_ID = R.string.TLA_menu_sync;
     protected static final int MENU_SUPPORT_ID = R.string.TLA_menu_support;
-    protected static final int MENU_NEW_FILTER_ID = R.string.FLA_new_filter;
+    public static final int MENU_NEW_FILTER_ID = R.string.FLA_new_filter;
     protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 199;
 
     protected static final int CONTEXT_MENU_EDIT_TASK_ID = R.string.TAd_contextEditTask;
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 06a69b2fb..bf2551c30 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -80,7 +80,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
     private final DisplayMetrics metrics = new DisplayMetrics();
 
     /** receiver for new filters */
-    private final FilterReceiver filterReceiver = new FilterReceiver();
+    protected final FilterReceiver filterReceiver = new FilterReceiver();
     private final BladeFilterReceiver bladeFilterReceiver = new BladeFilterReceiver();
     private boolean shouldUseBladeFilter = true;
 
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index 112ccdc23..9715929fb 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -229,6 +229,7 @@ public class StartupService {
             .setMessage(R.string.DB_corrupted_body)
             .setPositiveButton(R.string.DLG_ok, null)
             .create().show();
+        e.printStackTrace();
     }
 
     /**
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 4c628da5e..6aa22d885 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -28,6 +28,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
     public static final int MAIN_MENU_ITEM_SETTINGS = R.string.TLA_menu_settings;
 
     public interface MainMenuListener {
+        public boolean shouldAddMenuItem(int itemId);
         public void mainMenuItemSelected(int item, Intent customIntent);
     }
 
@@ -43,7 +44,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
         this.mListener = listener;
     }
 
-    public MainMenuPopover(Context context, int layout, boolean isTablet) {
+    public MainMenuPopover(Context context, int layout, boolean isTablet, MainMenuListener listener) {
         super(context, layout);
 
         TouchInterceptingFrameLayout rootLayout = (TouchInterceptingFrameLayout) getContentView();
@@ -68,6 +69,8 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
         topFixed = (LinearLayout) getContentView().findViewById(R.id.topFixedItems);
         bottomFixed = (LinearLayout) getContentView().findViewById(R.id.bottomFixedItems);
 
+        mListener = listener;
+
         addFixedItems(isTablet);
     }
 
@@ -101,6 +104,9 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
         addMenuItem(R.string.TLA_menu_search,
                 ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),
                 MAIN_MENU_ITEM_SEARCH, null, topFixed);
+        addMenuItem(R.string.TLA_menu_friends,
+                R.drawable.icn_anyone,
+                MAIN_MENU_ITEM_FRIENDS, null, topFixed);
         addMenuItem(R.string.TLA_menu_settings,
                 ThemeService.getDrawable(R.drawable.icn_menu_settings, themeFlags),
                 MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item
@@ -136,11 +142,15 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
 
     // --- Private helpers ---
     private void addMenuItem(int title, int imageRes, int id, Intent customIntent, ViewGroup container) {
+        if (mListener != null && !mListener.shouldAddMenuItem(id))
+            return;
         View item = setupItemWithParams(title, imageRes);
         addViewWithListener(item, container, id, customIntent);
     }
 
     private void addMenuItem(CharSequence title, Drawable image, int id, Intent customIntent, ViewGroup container) {
+        if (mListener != null && !mListener.shouldAddMenuItem(id))
+            return;
         View item = setupItemWithParams(title, image);
         addViewWithListener(item, container, id, customIntent);
     }

From cc76e6d1780407e03505fdcce17d7f3df7106cac Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 8 May 2012 17:29:18 -0700
Subject: [PATCH 04/13] Fixed many bugs with people filters

---
 .../astrid/people/PeopleFilterExposer.java    | 47 +++++--------------
 .../astrid/people/PersonViewFragment.java     |  6 +++
 .../astrid/activity/TaskListFragment.java     |  2 +-
 .../todoroo/astrid/service/TaskService.java   |  3 ++
 .../com/todoroo/astrid/ui/QuickAddBar.java    |  8 +++-
 5 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
index 859430ced..e5fd39c37 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
@@ -1,5 +1,8 @@
 package com.todoroo.astrid.people;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -10,22 +13,18 @@ import android.os.Bundle;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Criterion;
-import com.todoroo.andlib.sql.Field;
-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.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.api.FilterWithUpdate;
 import com.todoroo.astrid.core.PluginServices;
-import com.todoroo.astrid.data.Metadata;
-import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.User;
-import com.todoroo.astrid.tags.TagService;
 
 public class PeopleFilterExposer extends BroadcastReceiver {
     @Override
@@ -60,38 +59,11 @@ public class PeopleFilterExposer extends BroadcastReceiver {
     @SuppressWarnings("nls")
     public static FilterWithCustomIntent filterFromUserData(User user) {
         String email = user.getValue(User.EMAIL);
-        String[] tags;
-
-        TodorooCursor<TagData> tagsWithUser = PluginServices.getTagDataService().query(Query.select(TagData.NAME)
-                .where(Criterion.or(
-                        TagData.MEMBERS.like("%" + email + "%"),
-                        TagData.USER.like("%" + email + "%"),
-                        TagData.USER_ID.eq(user.getId()))));
-        try {
-            if (tagsWithUser.getCount() == 0) {
-                tags = new String[1];
-                tags[0] = "\"\"";
-            } else {
-                tags = new String[tagsWithUser.getCount()];
-                int i = 0;
-                TagData curr = new TagData();
-                for (tagsWithUser.moveToFirst(); !tagsWithUser.isAfterLast(); tagsWithUser.moveToNext()) {
-                    curr.readFromCursor(tagsWithUser);
-                    tags[i] = "\"" + curr.getValue(TagData.NAME) + "\"";
-                    i++;
-                }
-            }
-        } finally {
-            tagsWithUser.close();
-        }
 
         String title = user.getDisplayName();
-        QueryTemplate userTemplate = new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"),
-                Criterion.and(Task.ID.eq(Field.field("mtags." + Metadata.TASK.name)),
-                        Field.field("mtags." + Metadata.KEY.name).eq(TagService.KEY),
-                        Field.field("mtags." + TagService.TAG.name).in(tags),
+        QueryTemplate userTemplate = new QueryTemplate().where(
                         Criterion.or(Task.USER.like("%" + email + "%"),
-                                Task.USER_ID.eq(user.getValue(User.REMOTE_ID))))));
+                                Task.USER_ID.eq(user.getValue(User.REMOTE_ID))));
 
         FilterWithUpdate filter = new FilterWithUpdate(title, title, userTemplate, null);
 
@@ -99,6 +71,13 @@ public class PeopleFilterExposer extends BroadcastReceiver {
 
         ContentValues values = new ContentValues();
         values.put(Task.USER_ID.name, user.getValue(User.REMOTE_ID));
+        try {
+            JSONObject userJson = new JSONObject();
+            ActFmSyncService.JsonHelper.jsonFromUser(userJson, user);
+            values.put(Task.USER.name, userJson.toString());
+        } catch (JSONException e) {
+            // Ignored
+        }
         filter.valuesForNewTasks = values;
 
         String imageUrl = user.getValue(User.PICTURE);
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
index 05056c817..142e3510b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -20,4 +20,10 @@ public class PersonViewFragment extends TaskListFragment {
         return parent;
     }
 
+    @Override
+    protected void setupQuickAddBar() {
+        super.setupQuickAddBar();
+        quickAddBar.setUsePeopleControl(false);
+    }
+
 }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index f24e4308c..71848b39a 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -509,7 +509,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
         getView().findViewById(R.id.progressBar).setVisibility(View.GONE);
     }
 
-    private void setupQuickAddBar() {
+    protected void setupQuickAddBar() {
         quickAddBar = (QuickAddBar) getView().findViewById(R.id.taskListFooter);
         quickAddBar.initialize(getActivity(), this, mListener);
 
diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java
index 1e74be88f..6a6389b28 100644
--- a/astrid/src/com/todoroo/astrid/service/TaskService.java
+++ b/astrid/src/com/todoroo/astrid/service/TaskService.java
@@ -505,6 +505,9 @@ public class TaskService {
             task.mergeWith(forTask);
         }
 
+        if (task.getValue(Task.USER_ID) != Task.USER_ID_SELF)
+            task.putTransitory(TRANS_ASSIGNED, true);
+
         boolean markup = taskService.quickAdd(task);
         if (markup)
             task.putTransitory(TRANS_QUICK_ADD_MARKUP, true);
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 4a23a367e..fd54d35c1 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -70,6 +70,7 @@ public class QuickAddBar extends LinearLayout {
     private RepeatControlSet repeatControl;
     private GCalControlSet gcalControl;
     private EditPeopleControlSet peopleControl;
+    private boolean usePeopleControl = true;
 
     @Autowired AddOnService addOnService;
     @Autowired ExceptionService exceptionService;
@@ -178,6 +179,11 @@ public class QuickAddBar extends LinearLayout {
         setUpQuickAddControlSets();
     }
 
+    public void setUsePeopleControl(boolean usePeopleControl) {
+        this.usePeopleControl = usePeopleControl;
+        peopleControl.getDisplayView().setVisibility(usePeopleControl ? View.VISIBLE : View.GONE);
+    }
+
     private void setUpQuickAddControlSets() {
 
         repeatControl = new RepeatControlSet(activity,
@@ -245,7 +251,7 @@ public class QuickAddBar extends LinearLayout {
         try {
             if (title != null)
                 title = title.trim();
-            boolean assignedToMe = peopleControl.willBeAssignedToMe();
+            boolean assignedToMe = usePeopleControl ? peopleControl.willBeAssignedToMe() : true;
             if (!assignedToMe && !actFmPreferenceService.isLoggedIn()) {
                 DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
                     @Override

From 1896fe89c7f55edfe0131c75a305636518125a08 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 8 May 2012 17:39:30 -0700
Subject: [PATCH 05/13] Cleanup and polish to quick add bar in people view

---
 .../astrid/people/PeopleFilterExposer.java        |  4 ++--
 .../todoroo/astrid/people/PersonViewFragment.java | 15 +++++++++++++++
 astrid/res/values/strings-core.xml                |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
index e5fd39c37..b204f79de 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
@@ -29,7 +29,7 @@ import com.todoroo.astrid.data.User;
 public class PeopleFilterExposer extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        FilterListItem[] listAsArray = prepareFilters(context);
+        FilterListItem[] listAsArray = prepareFilters();
 
         Intent broadcastIntent = new Intent(PeopleFilterAdapter.BROADCAST_SEND_PEOPLE_FILTERS);
         broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, listAsArray);
@@ -37,7 +37,7 @@ public class PeopleFilterExposer extends BroadcastReceiver {
         context.sendBroadcast(broadcastIntent);
     }
 
-    private FilterListItem[] prepareFilters(Context context) {
+    private FilterListItem[] prepareFilters() {
         TodorooCursor<User> users = PluginServices.getUserDao().query(Query.select(User.PROPERTIES)
                 .orderBy(Order.asc(User.NAME), Order.asc(User.EMAIL)));
         try {
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
index 142e3510b..8be951002 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -4,12 +4,19 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.service.Autowired;
 import com.todoroo.astrid.activity.TaskListFragment;
+import com.todoroo.astrid.dao.UserDao;
+import com.todoroo.astrid.data.User;
 
 public class PersonViewFragment extends TaskListFragment {
 
     public static final String EXTRA_USER_ID_LOCAL = "user_local_id"; //$NON-NLS-1$
 
+    @Autowired UserDao userDao;
+
+    private User user;
+
     @Override
     protected View getListBody(ViewGroup root) {
         ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_person, root, false);
@@ -20,10 +27,18 @@ public class PersonViewFragment extends TaskListFragment {
         return parent;
     }
 
+    @Override
+    protected void initializeData() {
+        super.initializeData();
+        if (extras.containsKey(EXTRA_USER_ID_LOCAL))
+            user = userDao.fetch(extras.getLong(EXTRA_USER_ID_LOCAL), User.PROPERTIES);
+    }
+
     @Override
     protected void setupQuickAddBar() {
         super.setupQuickAddBar();
         quickAddBar.setUsePeopleControl(false);
+        quickAddBar.getQuickAddBox().setHint(getString(R.string.TLA_quick_add_hint_assign, user.getDisplayName()));
     }
 
 }
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index e1c3af808..54ce5d625 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -139,7 +139,7 @@
   <!-- Quick Add Edit Box Hint-->
   <string name="TLA_quick_add_hint">Add a task</string>
   
-  <!-- Quick Add Edit Box Hint for assigning -->
+  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
   <string name="TLA_quick_add_hint_assign">Tap to assign %s a task</string>
   
   <!-- Notification Volumne notification-->

From 3fb98995824e24fdc4d3ff1785a157098bc08bc4 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 8 May 2012 18:36:29 -0700
Subject: [PATCH 06/13] PersonViewFragment syncs tasks for that user

---
 .../astrid/actfm/sync/ActFmSyncService.java   |  4 +
 .../actfm/sync/ActFmSyncV2Provider.java       | 27 +++++++
 .../astrid/people/PersonViewFragment.java     | 74 ++++++++++++++++++-
 3 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index 79c4f3ccc..2f894de98 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -740,6 +740,10 @@ public final class ActFmSyncService {
         }, done, "tasks:" + tagData.getId(), "tag_id", tagData.getValue(TagData.REMOTE_ID));
     }
 
+    public void fetchTasksForUser(final User user, final boolean manual, Runnable done) {
+        invokeFetchList("task", manual, null, new TaskListItemProcessor(false),
+                done, "user_" + user.getId(), "user_id", user.getValue(User.REMOTE_ID));
+    }
 
 
     /**
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index 9a4921d9a..1a40cf818 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -25,6 +25,7 @@ import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.TaskService;
@@ -273,6 +274,11 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
     public void synchronizeList(Object list, final boolean manual,
             final SyncResultCallback callback) {
 
+        if (list instanceof User) {
+            synchronizeUser((User) list, manual, callback);
+            return;
+        }
+
         if(!(list instanceof TagData))
             return;
 
@@ -299,6 +305,27 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
         }).start();
     }
 
+    private void synchronizeUser(final User user, final boolean manual, final SyncResultCallback callback) {
+        if (user.getValue(User.REMOTE_ID) == 0)
+            return;
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                callback.started();
+                callback.incrementMax(100);
+
+                actFmSyncService.waitUntilEmpty();
+                actFmSyncService.fetchTasksForUser(user, manual, new Runnable() {
+                    public void run() {
+                        callback.finished();
+                    }
+                });
+                callback.incrementProgress(50);
+            }
+        }).start();
+    }
+
     private void fetchTagData(final TagData tagData, final boolean noRemoteId,
             final boolean manual, final SyncResultCallback callback,
             final AtomicInteger finisher) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
index 8be951002..d260cc43e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -1,27 +1,48 @@
 package com.todoroo.astrid.people;
 
+import android.content.Intent;
+import android.support.v4.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.andlib.utility.Preferences;
+import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.TaskListFragment;
+import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.dao.UserDao;
 import com.todoroo.astrid.data.User;
+import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
+import com.todoroo.astrid.service.SyncV2Service;
+import com.todoroo.astrid.service.ThemeService;
 
 public class PersonViewFragment extends TaskListFragment {
 
     public static final String EXTRA_USER_ID_LOCAL = "user_local_id"; //$NON-NLS-1$
 
+    private static final String LAST_FETCH_KEY = "actfm_last_user_"; //$NON-NLS-1$
+
+    protected static final int MENU_REFRESH_ID = MENU_SUPPORT_ID + 1;
+
     @Autowired UserDao userDao;
 
+    @Autowired SyncV2Service syncService;
+
+    @Autowired ActFmPreferenceService actFmPreferenceService;
+
+    protected View taskListView;
+
     private User user;
 
     @Override
     protected View getListBody(ViewGroup root) {
         ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_person, root, false);
 
-        View taskListView = super.getListBody(parent);
+        taskListView = super.getListBody(parent);
         parent.addView(taskListView);
 
         return parent;
@@ -38,7 +59,56 @@ public class PersonViewFragment extends TaskListFragment {
     protected void setupQuickAddBar() {
         super.setupQuickAddBar();
         quickAddBar.setUsePeopleControl(false);
-        quickAddBar.getQuickAddBox().setHint(getString(R.string.TLA_quick_add_hint_assign, user.getDisplayName()));
+        if (user != null)
+            quickAddBar.getQuickAddBox().setHint(getString(R.string.TLA_quick_add_hint_assign, user.getDisplayName()));
+
+    }
+
+    @Override
+    protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) {
+        if(actFmPreferenceService.isLoggedIn()) {
+            addMenuItem(menu, R.string.actfm_TVA_menu_refresh,
+                    ThemeService.getDrawable(R.drawable.icn_menu_refresh, themeFlags), MENU_REFRESH_ID, true);
+        } else {
+            super.addSyncRefreshMenuItem(menu, themeFlags);
+        }
+    }
+
+    @Override
+    public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
+        switch (id) {
+        case MENU_REFRESH_ID:
+            refreshData(true);
+            return true;
+        }
+        return super.handleOptionsMenuItemSelected(id, intent);
+    }
+
+    @Override
+    protected void initiateAutomaticSyncImpl() {
+        if (!isCurrentTaskListFragment())
+            return;
+        if (user != null) {
+            long lastAutoSync = Preferences.getLong(LAST_FETCH_KEY + user.getId(), 0);
+            if (DateUtilities.now() - lastAutoSync > DateUtilities.ONE_HOUR)
+                refreshData(false);
+        }
+    }
+
+    private void refreshData(final boolean manual) {
+        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
+
+        syncService.synchronizeList(user, manual, new ProgressBarSyncResultCallback(getActivity(), this,
+                R.id.progressBar, new Runnable() {
+            @Override
+            public void run() {
+                if (manual)
+                    ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
+                else
+                    refresh();
+                ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+            }
+        }));
     }
 
 }

From 02f25f7e1fe7a39369d55b627ece10cd6f23528d Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 11:10:34 -0700
Subject: [PATCH 07/13] Polish to main menu size

---
 astrid/res/layout/main_menu_popover_body.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/astrid/res/layout/main_menu_popover_body.xml b/astrid/res/layout/main_menu_popover_body.xml
index 160fed6e1..d0d1f5509 100644
--- a/astrid/res/layout/main_menu_popover_body.xml
+++ b/astrid/res/layout/main_menu_popover_body.xml
@@ -2,8 +2,9 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <ScrollView
         android:layout_width="280dip"
-        android:layout_height="340dip"
+        android:layout_height="wrap_content"
         android:layout_below="@+id/gdi_arrow_up"
+        android:paddingBottom="3dip"
         android:background="?attr/asListPopoverBg">
         <LinearLayout
             android:layout_width="wrap_content"

From 86ec3295b6a1b0cb455025fa14d8f0d297389265 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 11:24:33 -0700
Subject: [PATCH 08/13] Basic version of toggling to people mode on tablet
 working

---
 .../astrid/people/PeopleListFragment.java     |  6 +++-
 .../res/layout/people_list_fragment_3pane.xml | 20 +++++++++++
 .../astrid/activity/AstridActivity.java       |  4 +--
 .../astrid/activity/TaskListActivity.java     | 35 +++++++++++--------
 4 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 astrid/res/layout/people_list_fragment_3pane.xml

diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java
index db7f38e8c..7d4dc5ea5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleListFragment.java
@@ -3,6 +3,7 @@ package com.todoroo.astrid.people;
 import android.app.Activity;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.adapter.FilterAdapter;
 
@@ -15,6 +16,9 @@ public class PeopleListFragment extends FilterListFragment {
 
     @Override
     protected int getLayout(Activity activity) {
-        return R.layout.people_list_fragment;
+        if (AndroidUtilities.isTabletSized(activity))
+            return R.layout.people_list_fragment_3pane;
+        else
+            return R.layout.people_list_fragment;
     }
 }
diff --git a/astrid/res/layout/people_list_fragment_3pane.xml b/astrid/res/layout/people_list_fragment_3pane.xml
new file mode 100644
index 000000000..62d5b64bf
--- /dev/null
+++ b/astrid/res/layout/people_list_fragment_3pane.xml
@@ -0,0 +1,20 @@
+<?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="?attr/asListPopoverBg"
+    android:orientation="vertical">
+
+
+    <!-- List -->
+    <ListView android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="true"
+        android:scrollbars="vertical"
+        android:divider="@android:color/transparent"
+        android:cacheColorHint="#00000000"/>
+        
+</LinearLayout>
+    
diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
index 41634ae23..9c7f92f08 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
@@ -302,10 +302,10 @@ public class AstridActivity extends FragmentActivity
         }
     }
 
-    protected Fragment setupFragment(String tag, int container, Class<? extends Fragment> cls, boolean createImmediate) {
+    protected Fragment setupFragment(String tag, int container, Class<? extends Fragment> cls, boolean createImmediate, boolean replace) {
         final FragmentManager fm = getSupportFragmentManager();
         Fragment fragment = fm.findFragmentByTag(tag);
-        if(fragment == null) {
+        if(fragment == null || replace) {
             try {
                 fragment = cls.newInstance();
             } catch (InstantiationException e) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 4e873be81..ed1527a4e 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -44,6 +44,7 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.CoreFilterExposer;
 import com.todoroo.astrid.core.CustomFilterExposer;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.people.PeopleListFragment;
 import com.todoroo.astrid.people.PeopleViewActivity;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
@@ -279,14 +280,14 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             }
 
             setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
-                    R.id.filterlist_fragment_container, FilterListFragment.class, false);
+                    R.id.filterlist_fragment_container, FilterListFragment.class, false, false);
         } else {
             fragmentLayout = LAYOUT_SINGLE;
             actionBar.setDisplayHomeAsUpEnabled(true);
             listsNav.setOnClickListener(popupMenuClickListener);
             createListsPopover();
             setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
-                    getFilterListClass(), true));
+                    getFilterListClass(), true, false));
         }
     }
 
@@ -294,17 +295,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         return FilterListFragment.class;
     }
 
-//    private void togglePeopleView(boolean peopleMode) {
-//        if (fragmentLayout != LAYOUT_SINGLE) {
-//            if (peopleMode)
-//                setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, R.id.filterlist_fragment_container,
-//                        PeopleListFragment.class, false);
-//            else
-//                setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
-//                        R.id.filterlist_fragment_container, FilterListFragment.class, false);
-//        }
-//    }
-
     private void createListsPopover() {
         listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
         listsPopover.setOnDismissListener(new OnDismissListener() {
@@ -685,8 +675,12 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             onSearchRequested();
             return;
         case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
-            Intent peopleIntent = new Intent(this, PeopleViewActivity.class);
-            startActivity(peopleIntent);
+            if (fragmentLayout != LAYOUT_SINGLE) {
+                togglePeopleView();
+            } else {
+                Intent peopleIntent = new Intent(this, PeopleViewActivity.class);
+                startActivity(peopleIntent);
+            }
             return;
         case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
             // Doesn't exist yet
@@ -699,6 +693,17 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         tlf.handleOptionsMenuItemSelected(item, customIntent);
     }
 
+    private void togglePeopleView() {
+        FilterListFragment flf = getFilterListFragment();
+        boolean peopleMode = !(flf instanceof PeopleListFragment);
+        if (peopleMode)
+            setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, R.id.filterlist_fragment_container,
+                    PeopleListFragment.class, false, true);
+        else
+            setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
+                    R.id.filterlist_fragment_container, FilterListFragment.class, false, true);
+    }
+
     public MainMenuPopover getMainMenuPopover() {
         return mainMenuPopover;
     }

From 8c95d4a802d09d9e3dfa6ef6a294040beb23634b Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 11:28:12 -0700
Subject: [PATCH 09/13] Persist people list on tablet across device rotation

---
 .../com/todoroo/astrid/activity/TaskListActivity.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index ed1527a4e..6cc457ac5 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -70,6 +70,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     public static final String OPEN_TASK = "openTask"; //$NON-NLS-1$
 
+    private static final String PEOPLE_VIEW = "peopleView";  //$NON-NLS-1$
+
     @Autowired private ABTestEventReportingService abTestEventReportingService;
 
     private View listsNav;
@@ -279,8 +281,12 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
                 createCommentsPopover();
             }
 
+            boolean peopleView = getIntent().getBooleanExtra(PEOPLE_VIEW, false);
+            Class<? extends FilterListFragment> filterFragmentClass =
+                    peopleView ? PeopleListFragment.class : FilterListFragment.class;
+
             setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
-                    R.id.filterlist_fragment_container, FilterListFragment.class, false, false);
+                    R.id.filterlist_fragment_container, filterFragmentClass, false, false);
         } else {
             fragmentLayout = LAYOUT_SINGLE;
             actionBar.setDisplayHomeAsUpEnabled(true);
@@ -702,6 +708,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         else
             setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
                     R.id.filterlist_fragment_container, FilterListFragment.class, false, true);
+        getIntent().putExtra(PEOPLE_VIEW, peopleMode);
     }
 
     public MainMenuPopover getMainMenuPopover() {

From 0e85cd2714e46569b8aab03c6c0c7c6f061af9f4 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 11:39:58 -0700
Subject: [PATCH 10/13] Further refined menu behavior with people view on
 tablet

---
 .../astrid/activity/TaskListActivity.java     | 18 ++++++++++++++--
 .../todoroo/astrid/ui/MainMenuPopover.java    | 21 ++++++++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 6cc457ac5..dcbc1d61b 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -341,7 +341,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     private void createMainMenuPopover() {
         int layout;
-        if (AndroidUtilities.isTabletSized(this))
+        boolean isTablet = AndroidUtilities.isTabletSized(this);
+        if (isTablet)
             layout = R.layout.main_menu_popover_tablet;
         else
             layout = R.layout.main_menu_popover;
@@ -353,6 +354,9 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
                 mainMenu.setSelected(false);
             }
         });
+
+        if (isTablet)
+            setupMainMenuForPeopleViewState(getIntent().getBooleanExtra(PEOPLE_VIEW, false));
     }
 
     private void setupPopoverWithFragment(FragmentPopover popover, Fragment frag, LayoutParams params) {
@@ -675,7 +679,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         TaskListFragment tlf = getTaskListFragment();
         switch (item) {
         case MainMenuPopover.MAIN_MENU_ITEM_LISTS:
-            listsNav.performClick();
+            if (fragmentLayout == LAYOUT_SINGLE)
+                listsNav.performClick();
+            else
+                togglePeopleView();
             return;
         case MainMenuPopover.MAIN_MENU_ITEM_SEARCH:
             onSearchRequested();
@@ -708,9 +715,16 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         else
             setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
                     R.id.filterlist_fragment_container, FilterListFragment.class, false, true);
+
+        setupMainMenuForPeopleViewState(peopleMode);
         getIntent().putExtra(PEOPLE_VIEW, peopleMode);
     }
 
+    private void setupMainMenuForPeopleViewState(boolean inPeopleMode) {
+        mainMenuPopover.setFixedItemVisibility(0, inPeopleMode ? View.VISIBLE : View.GONE, true);
+        mainMenuPopover.setFixedItemVisibility(1, inPeopleMode ? View.GONE : View.VISIBLE, true);
+    }
+
     public MainMenuPopover getMainMenuPopover() {
         return mainMenuPopover;
     }
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 6aa22d885..7553a1c8f 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -97,21 +97,28 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
 
     private void addFixedItems(boolean isTablet) {
         int themeFlags = isTablet ? ThemeService.FLAG_FORCE_DARK : 0;
-        if (!isTablet)
-            addMenuItem(R.string.TLA_menu_lists,
-                    ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
-                    MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
-        addMenuItem(R.string.TLA_menu_search,
-                ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),
-                MAIN_MENU_ITEM_SEARCH, null, topFixed);
+        addMenuItem(R.string.TLA_menu_lists,
+                ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
+                MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
         addMenuItem(R.string.TLA_menu_friends,
                 R.drawable.icn_anyone,
                 MAIN_MENU_ITEM_FRIENDS, null, topFixed);
+        addMenuItem(R.string.TLA_menu_search,
+                ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),
+                MAIN_MENU_ITEM_SEARCH, null, topFixed);
         addMenuItem(R.string.TLA_menu_settings,
                 ThemeService.getDrawable(R.drawable.icn_menu_settings, themeFlags),
                 MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item
     }
 
+    public void setFixedItemVisibility(int index, int visibility, boolean top) {
+        LinearLayout container = top ? topFixed : bottomFixed;
+        if (index < 0 || index >= container.getChildCount())
+            return;
+
+        container.getChildAt(index).setVisibility(visibility);
+    }
+
     @Override
     protected int getArrowLeftMargin(View arrow) {
         return mRect.centerX() - arrow.getMeasuredWidth() / 2 - (int) (12 * metrics.density);

From 63d66058989d8eb560e2fac2e721618c7a9a51b8 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 13:11:18 -0700
Subject: [PATCH 11/13] Updated string for empty list in people view

---
 .../todoroo/astrid/people/PersonViewFragment.java    | 12 ++++++++++--
 astrid/res/values/strings-core.xml                   |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
index d260cc43e..954f9dd2b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -2,6 +2,7 @@ package com.todoroo.astrid.people;
 
 import android.content.Intent;
 import android.support.v4.view.Menu;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -51,8 +52,10 @@ public class PersonViewFragment extends TaskListFragment {
     @Override
     protected void initializeData() {
         super.initializeData();
-        if (extras.containsKey(EXTRA_USER_ID_LOCAL))
+        if (extras.containsKey(EXTRA_USER_ID_LOCAL)) {
             user = userDao.fetch(extras.getLong(EXTRA_USER_ID_LOCAL), User.PROPERTIES);
+            ((TextView)taskListView.findViewById(android.R.id.empty)).setText(getEmptyDisplayString());
+        }
     }
 
     @Override
@@ -106,9 +109,14 @@ public class PersonViewFragment extends TaskListFragment {
                     ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
                 else
                     refresh();
-                ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+                ((TextView)taskListView.findViewById(android.R.id.empty)).setText(getEmptyDisplayString());
             }
         }));
     }
 
+    private String getEmptyDisplayString() {
+        String userName = user != null ? user.getDisplayName() : null;
+        return TextUtils.isEmpty(userName) ? getString(R.string.TLA_no_items) : getString(R.string.TLA_no_items_person, userName);
+    }
+
 }
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 54ce5d625..152922bd4 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -100,6 +100,9 @@
   <!-- Task List: Displayed instead of list when no items present -->    
   <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
   
+  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person's name) -->    
+  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
+  
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Add-ons</string>
   

From 4c845f2dfbf43ab697977a9179f0d52016f84e42 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 17:28:14 -0700
Subject: [PATCH 12/13] Added icons for the various people buttons

---
 .../people_menu_button_blue_off.png              | Bin 0 -> 1751 bytes
 .../drawable-hdpi/people_menu_button_blue_on.png | Bin 0 -> 1946 bytes
 .../people_menu_button_dark_blue_off.png         | Bin 0 -> 1747 bytes
 .../people_menu_button_dark_blue_on.png          | Bin 0 -> 1967 bytes
 .../drawable-hdpi/people_menu_button_red_off.png | Bin 0 -> 1744 bytes
 .../drawable-hdpi/people_menu_button_red_on.png  | Bin 0 -> 1875 bytes
 astrid/res/drawable/icn_menu_friends.png         | Bin 0 -> 1578 bytes
 astrid/res/drawable/icn_menu_friends_dark.png    | Bin 0 -> 1592 bytes
 astrid/res/drawable/people_menu_button_blue.xml  |   5 +++++
 .../res/drawable/people_menu_button_blue_off.png | Bin 0 -> 1798 bytes
 .../res/drawable/people_menu_button_blue_on.png  | Bin 0 -> 1416 bytes
 .../drawable/people_menu_button_dark_blue.xml    |   5 +++++
 .../people_menu_button_dark_blue_off.png         | Bin 0 -> 1625 bytes
 .../drawable/people_menu_button_dark_blue_on.png | Bin 0 -> 1559 bytes
 astrid/res/drawable/people_menu_button_red.xml   |   5 +++++
 .../res/drawable/people_menu_button_red_off.png  | Bin 0 -> 1372 bytes
 .../res/drawable/people_menu_button_red_on.png   | Bin 0 -> 1443 bytes
 astrid/res/layout/header_people_view.xml         |   2 +-
 astrid/res/values/attrs.xml                      |   1 +
 astrid/res/values/styles.xml                     |   3 +++
 .../astrid/activity/TaskListActivity.java        |   4 ++++
 .../com/todoroo/astrid/service/ThemeService.java |   2 ++
 .../com/todoroo/astrid/ui/MainMenuPopover.java   |   2 +-
 23 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 astrid/res/drawable-hdpi/people_menu_button_blue_off.png
 create mode 100644 astrid/res/drawable-hdpi/people_menu_button_blue_on.png
 create mode 100644 astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png
 create mode 100644 astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png
 create mode 100644 astrid/res/drawable-hdpi/people_menu_button_red_off.png
 create mode 100644 astrid/res/drawable-hdpi/people_menu_button_red_on.png
 create mode 100644 astrid/res/drawable/icn_menu_friends.png
 create mode 100644 astrid/res/drawable/icn_menu_friends_dark.png
 create mode 100644 astrid/res/drawable/people_menu_button_blue.xml
 create mode 100644 astrid/res/drawable/people_menu_button_blue_off.png
 create mode 100644 astrid/res/drawable/people_menu_button_blue_on.png
 create mode 100644 astrid/res/drawable/people_menu_button_dark_blue.xml
 create mode 100644 astrid/res/drawable/people_menu_button_dark_blue_off.png
 create mode 100644 astrid/res/drawable/people_menu_button_dark_blue_on.png
 create mode 100644 astrid/res/drawable/people_menu_button_red.xml
 create mode 100644 astrid/res/drawable/people_menu_button_red_off.png
 create mode 100644 astrid/res/drawable/people_menu_button_red_on.png

diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_off.png b/astrid/res/drawable-hdpi/people_menu_button_blue_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..919a1e72e1759c05919ae3ec6161491b8c11bca9
GIT binary patch
literal 1751
zcmeAS@N?(olHy`uVBq!ia0vp^$v_;%!3HGP_`Uc5q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%kM>iug7jtt1OCwWrLqk_XM?(`+Cu0i(
z7eiwsGgCJ=m|mCs<kH;Kyb_q+6og(woO(ftA-4c%vrB4GW?5>ATTy<l0@%}5nK<2I
z=8DrisNNKuZZUJisaGH97=2LGB1JV!2$+6AOnAZta^OinH4m8Hi+~Bc=0KM{Fu!<u
zx;TbZ+<G&2f8K2afn$=3o85Yyre&?(R;4i^=jycu-kVjUKda@=SLhc=fBixya`i=4
zD~;LPs<dpft~{Icf>VI&@4}VBuAcYVW!}sXs=U%)uB0h#X)V{!ROGB3!*rm5f!RRe
z00R$)0RuA=50r~dP`c`9=*8X7?alu3Ev=m>cKP?JZ<mBJ@4wh9`uA7Gz7r>QO#U`I
z?l4=x)#M4w*jPRm9Qw!~%w(i0k#*$0^qlhh0*(zAonOg4l%Dha^3H~XD*MxS?KEcL
zlrZg*U70Ku9Nj!o&hzt&_c2jwYcnkB&R$ryD*1N6vx)YpUqqhx+m%baS`>4=W}Vf)
z*jo#iz0q~v?OV!nDKGod4bg+%&u1-bViQQ+vSn(aOY+=x)~A|w9@=rGVe2-TrH=md
z)wz`~#rWTd*<J9%#!{m0X<P0jzqU^+z31u959=$v<0_HVXHXI<ZYyIvD`fLpSDjxa
z&)<{=-xhEC7H@L<)#Kl960Yd}5o-G;e0G}{qw|GT*PhI%Js&c)>leGP<mB_4TLQPp
ze7>>x?s2jDuBC@OtgY^s6`HlZR9ar_-x@#de3|u<>?NtP;-%Ra?rmdEdgc_;!>Vlm
z@mcKE$&S^r&qb2&?>OG_P;y$Q+(g4E_G>onY+d)Q;>xn<8%1Yy&sLR*1-10qud><j
z<opAJD<`6YmzQi8aoRNJ8k?2zyx>290!hyGWm1y`o+q%dD7+GU_4IRZ(Xq*2PCT?@
zeDV6c=+()BGn!8uoC*}@5s6j%n)hOn=$U_OR^DsTZY?~-q4~VnyY~e5t34-I{ELay
z|C2ILacX~#dDFwyOXe6PrEw@acFb`5tQzSS@a;_P{T*VGGEu@U3+LIor?59o+I8vs
z#(k>}&+YOFKBJx~&*qglxmi%KrNBjgm1d5Az^0`KG_30tWvVZQMFxwoq?%uub%<3$
z?ra{@!);UMzhAmn@c*{^YZ*4~H7_-06!?EXJTJ#|o0KA}kMFfV&wPU8txwf=ynMBF
z!v}7S*%Jl*CE7&qf4rRB&LYvk$k_JS>Tvxu#}tPKMhSrg1~#xDTLOfORZz#Lo>hV&
XL};4Ypa1rJpsL2x)z4*}Q$iB}oUN9H

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_on.png b/astrid/res/drawable-hdpi/people_menu_button_blue_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..95be72f908c9ca741cf1df1204c3b97a93a4245a
GIT binary patch
literal 1946
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
ZOrR`+3UX{o$ZXf&QYl*@{U&&A#^3(B4q*TQ

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82daf39b4c2821d281efed3abd069e29b2924aa
GIT binary patch
literal 1747
zcmaJ?c~BE)6c1oAVi2legBH6a9%v=m4LQh4jF1DO1{6?0$4W>RvXW$DvOqwn6sQVS
ztQR9yix;-Uf>^E*tp{ScL=-QOqopE;wxc7$hzE9qfc*ozGrQmS-n`%M{oecDH=D64
zz|Y=pmK}*ivX}XbgNRj0yz9ue#P^qg-e<((f=j~iU@QucR~QhIj|z)K0GU=1jRYYI
zRl??4#G6F2nTv*m;bHQXuoBZU6qXo<NvkK&B$Bt#q*o|o5FCg^qEVfI_VoNE8i1+<
zv`~&5l<P%^8ud>!Ai;?NA<D!UC0|7oE(N?zFhQV2a0Ot}YIH`}B%qD(!o=R<X3~I>
z5IjaedoL<Xz6uaw1_a<RKo2Fzg#a#_0kJ_oo4*)ffe^@qSWJ-T0f8`w2ZInW`p}4M
z22~UsB$kfmA}j$-jpKTl$&8PWXT*ClFhevG;`8}Tki}%NJctMnV}cG>m^^ew`WS;4
zF)9tH9!D`9U}025VzIb@Mksw>f>u9Ht22(aiD($pq|h@V252d1EKn~0|4^-VJlco{
zAs_TkNNfyA&?C$s#E8Wjl*GYB(JiU;u*iTYaLf>bVVbcnu2N$-W>jN(KorbjK!9AK
zM0FO=2tqE0WjZ6S&?ym_SU@8<7$~ZOK`z^iC*^YZERGihNgyAH&GGg00>zLgi_4Kp
z$FO2d8LLHf_!w680n7a;)-nuQJ&{?A7|=LGB{g7LV5Ddmoj{9^l*JYEcosh1#9H2C
zRUg;F{-_ovA%<x=+W#E&n2VSn%XWNl31fWp5gjq_24b+Ywh6x_?u$ew_6adP`1=TC
zJOnybJ8zsUm6rW_pg>bQv#h&NR6K8eKL;*70(aA^THp#%536E!OLJZCo;?i*3U@Cl
zoGhK`;P&UcOIxC=t@|=^J4Dk5AN^(WwyUw%>Zg!wtSOgMNH!pFnM5IjW99@-O|NsP
zr1Pg-?%Qd3$=TUAU!Sr=^GnXW=*Y~(o`$-(I5Z94jA^zqCs3O1>;Qhe;Wdl~EbE>m
z+V#>et$)rE8X2_pZ>J}v^(Voffd{)BR`MLS0ahm@8T8oe%1tp~6CIuNcEj@eyfv=X
z)fBB6j&nuk3<diIN{08Z*nW&rr>*ZXKl~%lbzNNttE6>}AMnq`dAr&jFKF`7MZKie
ze)ajREVbsgHZZ&>gc>@lD6)R_EXs?7GLY6Vkls)_b$erRS|?A}Jikx1IQLao%X9Q$
zSoMZ<w`{T~RD0_xbfT8sy6)QX!1x;-+|p!)`kkb>!0jS)nzXf&iKvBlH8IZMq=HTI
ztcA9x%qvTT>bjhyujcN2Tm?1SJV;*J8CbfO8XnjaxZ!YtqQbqe&DeSW(Rc0B`evgE
zjgoeklJY0t96ayn9DK#S@j?P`;Of!eE*j1GSX*%AGfI6`N)5ICi?uCnzM)&ZH{JH|
z-h5rqkT^IqC_PJP_Acsb>;>=CWabA~thaLum&Mo|acSfayOT4H3AgN$?J$DY){ge%
zfmcIP!9&^PE`2VEGSIW_aqX1rR}kvJ&r_wDjD3ma_^m}zTO-Z9N6Qt5LEpNewjlcR
zy)ecy3%U2EUdoB~AE37uM7&(IaKX-W7hiuz+NoPflI$7#Q_nqJf1j2nf_$h?T8!d2
zz&+>7<lM)n;kNu5_O+z%2X!Z%xJ#&?`j8jAIF?gsm%8`NC(`zz6`jrd%6|XhIL-a_
z*?Ufm%g@wtGsxw6Z!TmHO5e18U2a`9*m0+wvh2;)jpvH*Hb<p8fxPhkL!R>FzJ>4R
zb)UXpS;;)AkxE%g>e{60z}>FXBS^NBs98^}--X-mv9hv_Se9Z%bsTY~jG7ZU&$8Y+
aN06Fqvga3(KR;>t&B!DH;zHku)PDh;XO#^A

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b7cda0c92dfe75d8947fba6f1771580d70b23b1
GIT binary patch
literal 1967
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_off.png b/astrid/res/drawable-hdpi/people_menu_button_red_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cf8523b5eac4ab54460517867e1e66df77f4a22
GIT binary patch
literal 1744
zcmeAS@N?(olHy`uVBq!ia0vp^$v_;%!3HGP_`Uc5q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%k12Yo~b2l?fOCwVYLqk_XM?(`+Cu0i(
z7eiwsGgCJ=m|mCs<kH;Kyb_q+6og(!oO(ftA-4c%vrB4GW?5>ATTy<l0@%}5nYi6z
zj?+A--W1$!vB0TUALtl;P}CwtHB1PYen3ok!Ub~RNk26YnBI$k3A=y&lr6yg;^gV#
z7*cWT&FtNIw+%$vG?km($}g{2c{QxuYnxT@Zqw*pS8Ih9`v;}JeqrZmaw~YM?~5fD
zqiwT_Pd?%h;EJsj*8Fc@z`(rdgmc}KhrWDz)47}P1TaW6Ffy_wI5aRy2qZADvB0@l
z1mh0=kYzFZ+qW}!=h~O$v8>yt+&2G}>$=`_%i?|mvpf6veSS~9&1bNTJyG<;)`J2M
zUx;sidgA-JJNIVtMOr23*vz`WO-Mmv@8+W{>--lv{?~Z+vCECqt!>e@z9)$x=E768
ztEvv^t~vU3PV~)5bxRleOgz5tX{5)$ki-ot_2-J)6{VgoOkMQ%;M*%7-mGmay8WqR
zM{VAWemkK(XTlEO;0q4q?#S9wVtd(8YW9~4pLJ$w_v~ie5H`&{bIFU%+YKf){^pGC
zGX42RwkI|B&@@i<Wi_vYGfppWO%^Q|WSgzrvoK4_)+)^8=7CLWlYJ$eufOs2zAeuC
zbU%-d_tEb+4`$r@u~h1mKl`*&Q3Hv$S*e#qx)y3BpIyFfr`r5<&c$y$J}(J)7u;_D
zbnBrLRa*D2T3DYfC`@}h-8<Dkd3w&V<BGMmy6-cu>~*R9E!VM=dvTJM#Pf-h%VX_T
zPra^QKBwx@JRvuYpFNsAJi-4mrk<T`S9naB@9v{{B}rF{UvLN}%kuI3{_Jm8GeM#1
zT9=mYXGO<b1}j$|SfMxZ+N6Inx5O0n4tH=kEJ|Dvu03yxlndLjNenN(JP){ka5u-|
zSEXutDNd)pcOQ{^Y?8Fy)@^y#mtAbmNAC4Da&^bmdOy?)d2v>0j|}hH31u>F4~2So
zFIO9i2(#RsZf)tPY4R+xK*IW}Po9bSJifIYO)GalZ+YVqU=;q!?&@+YHK&UaoHyq0
zs5Ou|w5M^RKud*_yi?TAyMZsPZrQQT6mkpw8U5^ruXJhG47ESXy78xX9^%N%lrr3|
z`lsgnTVCDXwG10;&Az^1?D+qDs(W;+t{Mm9zLT@=oAGnapUEEIwB6&)ruVyretbKx
zdjEfzGy@wjm4eV2KDHwa%mxYv7<f1g7?_!$<behhK@gXT2S^^~|0|ln@a}n+)NH$r
Qx}ZA7)78&qol`;+0Ac8j$N&HU

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_on.png b/astrid/res/drawable-hdpi/people_menu_button_red_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a0e865ad5a0247d5b449fbd97950cd5caf00022
GIT binary patch
literal 1875
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
JJH=g_@(%#v>u&%6

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/icn_menu_friends.png b/astrid/res/drawable/icn_menu_friends.png
new file mode 100644
index 0000000000000000000000000000000000000000..d04d6058e8a444dabd0e150cea8482b69999476e
GIT binary patch
literal 1578
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBM!3HFm*<v37DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9r7D>r5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi>#nr;l&CJcx$kg1>(ACh<(8Scq*uucY
z(Adb#)Xfd1*Cju>G&eP`1g19yuGicEr(RHE$SnZc?2=lPS(cjOR+OKs0QR(1CT_R5
z;4}}aHwC9#%v^Em)dxC89~8AnQ4JFUrXLU!o^XL2c+yYJ1E%*PV8UJ^aKn^=foYDX
zi(^Q|tv53_<{dH+aNs}kU}B!+X4B}GF551xRhGW%wZG+?H&?X#kEXPim5HZkOkCS@
zbA@i~DvqNYljjRBm{TGYB=h^-(|0vya}Pgc;O#nJdaSf%fA^%K-W~fMzjs@5S)oDm
zI{(>?>tmk#N?f&de9m~>PhXYEWkr4Q+v_#?=fB=7wK5T8G-iIzcz@>HY8DRlI-Tb`
z4rW-K=8%|sLMG^?WX;6}ZS5zShfF8;$P3)icoyL`&v1*n|3;p-H+M5A@JM=hT~)sx
zdvdci6T>D;n|0?^zdq$`JUT`5f#;m_ix<6;bd}Ydyz$XYcTR;X3?>cFQWiW+@ZeOq
zaOeH(oRyk6*O)Hoi`Y&MDBZeuRm;ns*FsihSqu$a4eO@3diogTuh}_mvzte`zwT|e
z?JQ<_rq_)&%@uNpG!_wL=rFln#Ky2;w~^%JsAY~imb_{%W|J9DXdTnhVbIZfb8;4o
zfVS8gql~<YS+|@2glPm@%n00mNNZ8&p@~Zw8<sM~B>n#Sn(4-Mod(xPNrs5bC3ABh
zu48SGv}5k(C`dg&|HT~+)`|@QU+*u9TCaU*{kyBd$2ZzeWssP+!^vRxnI12$#k>uF
z9wnz_oR11S(a%`%qQv1s-m|GzPRc$EUoK{PRbM;mXT(0?^4EqqiF3b`E-=5zDyc0^
zneM)lL7^z~)r%u$M?#Xs;(c4*vE8}DbDp(9^J8jTe;@miV`>~qs&kA*8SZtcNiTS;
zcj<*ijk$|^?gmx|!DkoJs=n~t=e|%Ve@nQ{I;<me<I2lSvl&i^%WV6wwe(eAf8fT0
zYxNeh94L_f{9udgjh_d;ifs>6Wx2cgz!RQ1_IWSVLfRGgKaJV$%l-QB1#ydi?bjA|
x<h{Qrc7X9*v{lG=Msdw>hH!@eF?FmG3{Ot)T%Ezerv@s$Jzf1=);T3K0RTosOJ)E7

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/icn_menu_friends_dark.png b/astrid/res/drawable/icn_menu_friends_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a698aeacfd4a6f9e81134c8555a69f5a798e30b
GIT binary patch
literal 1592
zcmaJ>e^3-<7~TU!KtwG^4n<q<BIES-cJC**aU$Gua&UKD$0?{VvfM4ObL{PMyTpNE
zRG{QwPA1K0rs-IM22lzjMyXMv>8M$Ps3}+pM#AU_iD~U2P=7=_v-^GDJJ0jH@B6*a
z?3-50^64RSLjVAnZcM^#{JM;PB|(Aw*FP|`hhHMN#B?r|&f$u14*|qG>1+ZtQg|+5
zBXDPN!6_n^hdxW%)46oB33bpEg!?d%mtuG}0K~?58QkF_I53;YCEYsFz|pTnAnDYJ
z(o|;H%;<?cGO5Hvq?TChjuMwc>lDQ;1!KJ^FF+9-4tlA4H;a08qETIx-}}Nc5jYCr
zTsqN{qSDP)P)~aZPzAwK2dqXwwGu*<uvV#E0?J_omLYN(tdSxxs?wk^0**Z*KAXpx
zgW52|ST6pg6XkIngUVz@MMY4N0-`;+GDNG@%3!%nE|>BMDO>F3aIe(OipLc&f^~RE
zh9hY==u^bA=|WB?;wyd90>w<oy4kU7;xA0*#Tgj_!M>KpfoAjnLn&$k&2l#4pL+jO
zn6(!(gv>^;bfL$=4=zXSOU0mi4}o*E$4=Av<F{zdqdA(*qZv@2s)7*Ej5|oTFEYw7
zn^B{i<#4xyFk(6puK|&y6V+geF^EB<(8^UB1W82V5v3|Y5d&k0LatUB4C7pkb`(;C
zn;Yjk|KTbp<@(G(F??o>@Q^PPPJ@T0z|p2ra`IY`N%h9K&dF<$Ps)|?#mIc4{nx0+
zL%e@{+X>_HhY9NwZr<-6-q_7o3OWJ6?|>1Dw|l$#x3{`az%$D-w=EPqnsQuCIpQ@6
zu(~e4p;|*e42Vtm`qHdjA5=9|NY_L}L?|xRLbmdr&ZTQZ_w3{(b(>3vAKdx#;?ZuV
zeaWVC_cyyjcOU%hR?Dv=g57mV=l0%H)W;283_n&obVLGF=y%V36i3DPt_pdm?ODgh
z@8iOjy?w8=ZFpqxn#I3&-iEuO!2{VqTey6KHL`6}U`FO2kJ?o?cT5}E7@(fxSTcoz
zI#UhCu%XB+fK@23f3Oa@9NwWfUl9v{3&I5*q<K>nke<BVZ`ZL0a><Ua=Wi#yUlm0y
zh$>4GSlj!JH8--bV9<JXfLc%+oxjrW{3o+@rkbY4*3)e(`Z~m1|Mvha0S?&0qoR*D
z*Y;%8%`dkP|Ik7)%d>7;3ZQMjZv$?J>0N$+>zgC1{g2(?D*6s-OmEl+W46w^YzhSF
z-a|0Zkk_#2^I)*r)akVDWz})P*8>D!<S){Nd{>$C)be+OfRy0oGu-_`L8NM0){2!u
zz~YL-3hC9=K!$UkqOz>1|3XXHROZt>^wk&ltfsjWGomF!7_(|?*G=WjP#pZxv42KM
zdFz@FZNFh_yS-J1bH$RMEoU3mXz~5yJ1?HBPHr{a@%tqmc}*u4F7g*{Oa-Dcx4`y;
zFO^4V1bQ}mU4n2}mOMY`9Wq7JBrsL3YVA0^{!3M*=z_nco9%%|($b!ZoKd+_>US1s
z+jag@=fYP`1s^Zi(kK@63YJ+j8cT1T!QYyGJ-q(h?7nW{$KRG+E}fd6yhT^m-W6cA
z#56Q_p@k<m?mbdb2kj5Ik+5Q@lSsjDJ>4<2IXPuv%}-OFo6kHxY%$e9`p4VZYf9<9
z=s~FO-r1JL!=}3f#nnNTFNA_09T21~)&LsduZ;Cmgn;_Js&G_?&GG%qjfoblJ|XM%
FzX79{NT&b*

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/people_menu_button_blue.xml b/astrid/res/drawable/people_menu_button_blue.xml
new file mode 100644
index 000000000..25dff3d5d
--- /dev/null
+++ b/astrid/res/drawable/people_menu_button_blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/people_menu_button_blue_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/people_menu_button_blue_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/people_menu_button_blue_off.png b/astrid/res/drawable/people_menu_button_blue_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccf838127c547c83b5e329a6d7353034a474fc0c
GIT binary patch
literal 1798
zcmV+h2l@DkP)<h;3K|Lk000e1NJLTq002S&002A)1^@s6(tK=L00009a7bBm000XU
z000XU0RWnu7ytkUxJg7oRA_<inoDd{*BQtE|L@$HvBy9YOhB%AC~Y1j1kA%tiITP<
zk!VzsE-INWsy1D>i>@klhbnd1Ri$pasMJN(D6?o}Xd^{c9}6NXnO77Di3m-384^N?
zu?;hG&-d@bckmlC_+nVxpX9}yIsWc<e)qfgoOAC`5()sj-w8Y@6e2PT5gCPuj6y_4
zAtIv?kx_`qC`4owA~FgQ8HI?9LPSO(A|tt<2PeRRTI*!g@aDikyl=VOkLMBn2ZpOK
z|B+xnCb<p(AWuaep*Marv}eOVmO7^;7t#05<*rgQ{jGIWUsu`$<gHYIBmrU^SK9o^
z(4O8uEM;Cxevc?M(jT&1dEJ|JD5j8m_7|Z>9U!X!f4z18*-cBC*OH2OVerawnEhNa
z0`7D6QQCx6I#wl?{A?+6%Uwj@JMVSveEaH(XKE+QGrt?>&Fz5JPhJl5A%NJv?X6E9
zn)yxtf#K>ze9Vf!7;>96`hR!06xa5=nE1m_G&FAIjuqoO2G9TN@ORgqZuPN%KA461
zs-cBq1cY8IReAti1Ax7?S~%VD+zSS6YNRn#s-yL-`*HBtYwJ(sk$-L#k$!p2HhSCz
zqQ}V9pnnzQYyE#a^QBvzoU2IVg25z!=mJn}HGP=ue9EYo1@s!Z8VDQA?A6VK|5=kq
z{<(-Cz>;wr+#|$PP$aA&`byoXJT=+z?xv`{HH1=yTSPOEO+gV-li>2sP}!Wv7;+Ku
z<lvQMQF;g=OsjbVKtuPf2Jw!MCxRjf07sXdPUu)EVOo62Ed^E)Sh&g-AQuspFD`aM
zvy%~x2$SXQ)TeS6xIo?{2wtZeV*v2TXon%7iW!R@3WBF4JSZZ%I#ynXFstk-mrJ9q
z&%x{n<jn;Gh5!iXO4phf0AK_oQEsE)bb|^;BGd&eGz~3CE+XC?SbGCzpJB$ScG9KF
zaO-m;gkzG<a-l0k0N_Us{ot_?061~-=`;l|ku&lY(g0n~V+^^?8ZLXE@LTajqfuWp
z$8c-<JidF)7-4^6Qkp*y32)x4d(<1ZV(o)l+B_vFO3sP+pi$%XO6h|<^3P2~r5Qhl
zIMTYo5ekAnI<fbWv1uLEc*~ph|IxynaVFaB(9t8O4^C|_k2cN&cEz%CGRfpPcYODn
zPxHt>HxU=pv*UoqY;tB`h<05w?j7as4IfDU9_FbECMD40pSADBbZYy*%SXpZH6~Lw
zNVu9;{)-ktfSU*3U$eSv{mTL#c22CHC67*Q-SL;<Z)_aAvb@#*-RE$F;APr8hc<&s
zl@F)J-+JJD@3!U7??J?>R(z+Nfg5-1zp%6az;Jc$U~P=!Znxpj)J~R5*0F)*@)klH
zMe6|NoKgX5l`%NtNRP#OICcDcz2|rQ^}-vWqwD*Ab9`1@>+FJVjO`v8JNWk<onL!A
zm2EMGCn)cbF;0sQ8Yq#xM&THe^wiL|Hw@1TdIz*EV%I;BjNZ8Tbx+exp!I+($rZ`j
z)8|wqkfu6lpA+^|CZ)|v8?zHCmEn!X@1b~vWVgEq(rzD{Ai*GM)C^}+aOl`~dOvDs
zTy2ZkK6vh%47M9^2-DBdTsaDgMwG>{jzk|ETVNJ$y8|@?+(!frG5RStTrwCW&3%V$
z9Sk%Q=89thr9Te6+H>|!$JPGsGq6u`C+PDn=LDu82zqCbJqd6d$aM@M5h51chPwmg
z3Jax|q~^1PK9+P?&;<Yu6HPPM6aWZ01Sh!ML)--5-iaWY%vVLCB48k}7R2L(ZI#(d
z(f~P>rgQ$^+`$B;O(57Z1N-E0Gll<3ejL;p2v<QSm~(keqN&>~R%X+FMa+LG$QU+4
z>WA4{hNP;PP7FwkcsT9eI-oIxN6GN0+&_o>48=o0{7mAkONQ3oHQ&Ang3#p7Fl$UH
zJPYy_h9r^u#M#Ul`Ginf=%$5krRi6I<V`YOa$u?qDlW9Mn@;=dh=_4WqZCFdj2d*^
zpcN!v0+~!y!J_v-w?!VIn1ZEJH{iP<Z?y8EFp7!U<7PWC+nzND*g&l|&Gwnj=YM6D
z@-MvE1a3cz<_c*5IUc?7t;fa=9i94J?c_;m-@ZFOBW+(A0vrPa)7tvq9`0dM0-Cee
z1@{ukVU=nXb#*QFEm=MfZ+&93H1D$c9zq(>#$+@fxriWf748>xkM9k0A&+1Z>x+$(
z%PT+r5;pMk;vbjYEw#PynY-L}xi2q)A4H1ZM`RQtG71qHg@}woL`ESZqY#l%h{z~J
oWE3JY3K1EFh>Su+Mj;~O|C#Ii57rQ&7ytkO07*qoM6N<$g5|4D)c^nh

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/people_menu_button_blue_on.png b/astrid/res/drawable/people_menu_button_blue_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..48521e6c33bc4013f4a04d61e3df09f5fe0b497f
GIT binary patch
literal 1416
zcmV;31$X+1P)<h;3K|Lk000e1NJLTq002S&002A)0ssI2T^{=m00009a7bBm000XU
z000XU0RWnu7ytkTI!Q!9RA_<inM-d|R}jblbIv{2zOj96<Rqj@K@gFLQu+`SD#Qoq
z2K57U(a+FDH~j|vD&2L{1*+7p*;GOWil7k?o`Dc2e%t3UU0gfZj$`{ej_OMO$&2LL
zXXgIz%$yk?)74*J;{T8MuWw*7%w$XxGa1vwOvW@ZlQB)qWK0t?8Pmi}#y}jyFcToC
z^<uy{=F@TKorY1%2qb-TZtm7{YAFx^jKkkW{qxiEo!zD&(4;+1UWQ}LN&4~A?5*Xw
z&g)BoyfL5n>Hfhl+f{GUNig}Oa^PDZ2R#}hl9ImP2-iZ-PCB<vB!d}_!QEFvCB9q9
z9JeIri*GNcO?QnPwG)>yWpI={9%YnJf?WF+EU*!(r9ci?yAi5<LPSd<JAp@`6273Z
zqcl!!FyIkgoA=M9JVB@%{<F|{R<?p*9j}E-4lLn?q*zGELPHag1ir}oD;XsTP0M!+
zdaI-<{thr!i8D5G-j%%13<iXclu8yFwUTiR<kXM|2T~*@G2oalW&CUN2?;nr0HG55
z+U_=7+$0$%sRUs?RL;S2)E^Lf;zC*;=E;aCL93w>fN9&AQ(`rvtc#snv1Kq?CDG-I
zkn>wthNc9e)i)$jsEE7Y%K5^JpH=Z?FnrPLhk!r|FcYEB81gVHmTR`v-~*4kHZ6uE
zND+J2iY<c(Rl_|)1p`&%KqP^OMQsKO*{PYgbti}%qpG>{kq|*UXcxQ9$Cm*#92c6d
z(>(+48cqOG(4(T>so4P*9v<lT4J!zS`F*pinl1DDhI8>-$T%hL7+Ym?sDgm9=I0ed
z1Om#2Z@;b`x3=l{_UoEQAV51jt(e1JK|tN|ld|^W&s<}+zZX?gF|B+MMB5b;r8@x2
z{KuPmNxQxa@9j757Mh-*$oEdo?rSFq0En<tvwPifK1CUhQE!)N<i28^Zl{7G+A8VC
zCEa)J?{Dh$cE&MKvrfCV9pFH-9cwCy(f*>rK@b*`Vl$^Qs<p{j$Lkrzj7LRX(#*hK
zllPkaqp@AF+OZ&#gr%h1%&Dy38cZDHLRuEJ|4&I*Ei+^AG%$_~!w4jnlHO{lE~KO{
ziQA8jfvhjS$|o-8{D(#TtZcSQ$L>{@IU#8!9og|bflfQ25;qqTpPf;UisorqziT)*
znwa4-7*GPAXZ@A5w~&;QTFtwY=-)unl{5b3oGLbXCEefh*B=GvQ(n%G%AvoVj3=(=
z{mWVPrf%;a=<SLbDujmq+T<8l^Zt$bM3hv0pK|n;5;z;kwTxQLct<+q2P%di95kPl
z&0fO-B#!wY0g_O)eEU`HMb!?D$?#|h!dj?~t31mfz?XC}<*kS6Y#@i`K+2<Q`NSt#
z|7F!YIM8qF)-a-`-U$PSk@CdFw0c%Ca^U_oQf+wsEJOkplk$8@u7@fdHrVzs=h14Y
zE@jlKx_MkQFRG@fS@!#y-q(BYXGU>(G!6`0OnaMIwV0I2(KnPM5Mep+mILoVyO&k-
zS3wt=?r2zsGLnqLnKZ&OHnZyH;z{nmm#h-mtiK$n-(J^t8y_m6$MtcHlnFJ<)%L4w
zIOWmx`NRY@9Fq0v%e-%xD;*x2?fy7`k)rX-^XlQ>Rl`4QW+xelZk7UhXSZ>0zp2`}
z#SC@acGhMj8J)YkWh^95@yIkODUf6tGR{mg&JCT`3FZlieWXA@QM=v7pl=i>WRzm)
zVR#qsv*r{IVLRdYL+)7TR3|&(I}K*PZ%h+28Pmi}#xyaLF-^>5OcOI1)5J{1H1RJ=
W>|BNYG&xKF0000<MNUMnLSTYm+NvD@

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/people_menu_button_dark_blue.xml b/astrid/res/drawable/people_menu_button_dark_blue.xml
new file mode 100644
index 000000000..daad105da
--- /dev/null
+++ b/astrid/res/drawable/people_menu_button_dark_blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/people_menu_button_dark_blue_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/people_menu_button_dark_blue_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/people_menu_button_dark_blue_off.png b/astrid/res/drawable/people_menu_button_dark_blue_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..e78e8af092426ed7211a643fb688a0b40f5f27b0
GIT binary patch
literal 1625
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
X?+Bh?u+?6=00000NkvXXu0mjf4!r-3

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/people_menu_button_dark_blue_on.png b/astrid/res/drawable/people_menu_button_dark_blue_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1a6afc28d7342535daf62f8db96b773936fedd5
GIT binary patch
literal 1559
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
JPDHLkV1m4z*&P4?

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/people_menu_button_red.xml b/astrid/res/drawable/people_menu_button_red.xml
new file mode 100644
index 000000000..a2ed1592b
--- /dev/null
+++ b/astrid/res/drawable/people_menu_button_red.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/people_menu_button_red_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/people_menu_button_red_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/people_menu_button_red_off.png b/astrid/res/drawable/people_menu_button_red_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fbdeb11d5d437c73c715b1881ccb715843abe9c
GIT binary patch
literal 1372
zcmaKs`9ISQ0LQ<sjcl&rnd?a{^`dy@nllf|G0S~D3-xt`QML%vGh&M*t0y;&dUEZN
zV>y=E(k4-&de-B3bQt9xEhb0N<M{{r;r)5P|ANnDA1^ofF6~_a0Kl>CNBwr}yo0?w
zWM>7G)A$`JklgV}0HBEYA1R=Mfdl|KCG1hBfY_|X@{>gMKxFTQm*tBlo>*-~soQF@
zMo*@^tFsmVM#_5T3uDBnbvgI^;9lGoj6BhigX4DpQMOn8ZR=LyEkkDDF4xnz)R+^$
zOp96*QaPMO7U^t;6(?zWAnASDG<SyEcF-IJEa9PIu1daG7G=+u_eOUkevmH*a`AKD
z8qX!W=EWG?xIU>hSC5~wFWA((wz>T{zlN|Lr9)9Y;y|#T%9I~A5^wBT&v$@~q@wx-
zTF`MDWPS+aTBfX#0tFqNa{uJnRV&MV3ML=N$^aD^8>C98<9rCETsfd%*<bLg#^M!a
z2_r)2VvmQ7I!eo5EfSJe?qdm{hqe)RqcH;V^i<tG0>sOj{1EV!3L;_)-3II8!eFlO
z9FA!>XbtVl^lN%}h<@ghKMzAAyBg_H58@jQ%C&r{Bf5;Wip#vI@HMXFt5cf`z(@Pc
z`n3WgrrrRK19M0eQ)^Gy&`NQvfYa#swx|+qn=+q<VAI?}Nm4BQYRsRHAbrIz>hfxF
z*jh}2=4Lt4w_q89a$Hfj1Y;H*UnOVh>u+43*oDkSqFeRhUy#eTtre<iG^Xbgu_YZV
zB+~jS2UI{YvUA*{-btCp97})DVSqqsh6k$LQ~g^1#RYwkJW8(<hASns3;voAWPCO|
zw5Iv_yqW1_JAMefd;hSM3#ldL8~j_G&yodG2G(Eg)7+6(nOyh`yc^4AXNwmiqpAGC
z-biA1f866iN?Zx>6Q_uqi+{LuJiC>jD2Q@h>AYcpLoM})OVd0{6RH()tbay{awdTw
z`(0P1OaqH0U8?=26vU!ul1)ieC?vHt_g8aN9;<)`wKtWf6~B%i>dp8d)*%tX{+;{0
z7)*I&TR+%9b%RTBWPjEOH@LEHZpicy<kAXxIFB{*q$KHkyJQ;(-EH|50krjCSA2Dh
z$1_ST=<}OY1=?+W&AGh<)&hoGTG%|aYW1v+URDHIW?4b|^mH*uzjQYlrwG<NzFna8
zM%y`mbeP4BmE!P_xS8jIZ6jT}Fc*|(<-~i=vA0q*_Se-G@S8N&Pjxp67PchY+9odM
z=<B>rP}xUZ{65DSd;C~nbvwp7I8%A|z1d(OXadR~fuKxbol0XhW7lhkrVl$2V9gj4
zwjS|LFlxFsHFzQ)2mKV4xnamah&0r*tU_Nan+;m)XIX;%pive_Y533}gFbJ%;ZSnv
zIdrh=)0eLEUUVa_#zyijy^I`vqy^cMdKNsXv>a&rQEqiaOp!e>Dbb7ElNHZn@LO^I
zHG!i2%;8Ddsw&kI6OnODRuz&3MIv+&qGj*06KW&wpPuR@I+A$8E`Bo2h95TGGW8&S
z70$H7wEf1$W%qyq;yU3IDP$fNK5Ogy1{TD5&%Y}FB1l-omlmT4{NV=Jtl`Y>7-wTh
zhh&28MtV_uCC1zPQHa_+!5qoIqrg>re2)h|b60(I;0c|0u?JLg)n#a?vzH~DS`04q
zK{Z1zA$a0i?1$`gN6up+21L)N*;;cS>|wvs@hnxy$8a)y+qfdVL!;@Khe$R>eb&^_
zoaerv#9wNPI~8%UW$#UejJIBPiEiB&ZdPr7pIT$6MPEFCoKSEjQ&p?LALh2qOS76r
U%jEBsJ9i0SUA&GqJA>5!0Eg3jOaK4?

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/people_menu_button_red_on.png b/astrid/res/drawable/people_menu_button_red_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..edefe1fe3020abba577ec3525a2fe67d0db39913
GIT binary patch
literal 1443
zcmV;U1zh@xP)<h;3K|Lk000e1NJLTq002S&002A)0ssI2T^{=m00009a7bBm000XU
z000XU0RWnu7ytkTRY^oaRA_<iSW8b+TNGYv@AGI+p_kHLZ&1Ks0zw*EK!unXBN&bT
z2p?k|IPxDjbY$Ylgv5c-IME+qVjPe#z*>ohN`yon@_zMk=y~kD@1V6jEamjv;%!L3
zbkNg%)>_}U_gZ_eUHk^e0p$NCP#M%@R1<14stGk2)r6XiYC=s$HK8V>ns7{HNJr;d
z03afeUo*v+0KlV(byPA?(;9By_TRlLwX^^L*mgD++kEmwfB*hS!d3j*Bmjud_s`R(
z{yTT}59#{Sy?a~FpI3ZMj-)pJx^?S!4FG_e_V?q*YB*f+h?SQ?>+1s#A09Xw3I!fK
z5S0$<UPdl?h~JNjvinE1uTO4mEn(>C>!S?~dq`+n&W~$(E=wF`S-WyY>F5ALgs$r!
zK3Lzs=Z4g16eulWOHZAWnwpHwO$0zny_YV@;V@Dv3}bs_#Qgfz1s|6()ZSiga1b~b
zLLjAee*f0+FyGn|05lW=ELFqA=Oda100Kbi>e8-W1xf|yNC*uClB=us(o(s6TqPBv
z+S@A_6SfVE3DYEvjY?NnJ|%?H)F70qk%%BfSQaoQEQ{3FE8X2LQp=4DQddVB8i4cN
zKhj|E*YIIJ5%bF>Nwl$Xj~_y4D1;>!vpA)44FCYW-hGh}F_$L@z?PRwF9=VicqRh?
zKnT&aJueG^vRpbRi^7czo=S<mM1>G6oz8vF#$v*<N|@WTv-bQv003hwo!&zlQ5eR)
zb#?+bGQ{>aTUpr?o^!UafB*<!#^d(PObK%%7GudI0tnk?i;K7`359LjOG|&KHUPl<
z@?|GHBH!97Y`8p=Nxgh|kfAV)<f~Wt@0^>71TdDL5k#Tu=EQ`HR>h?ZYif!olezFn
zsW~~BPj>(Tkb3);Z)_Ab%#Mz3kBsDqB7i+N$5vPKy8<Eh>?~VecEQJ`46f@ulgWoi
z++8gQU`|XJ<KsmQ({J7g+b%qcOh%Yy;gPMcyF19sJN|N42<gNL^}+=b2;^!}FsAnO
z0Ov+L&QmD?z_+&#I>O9v-*)_*Jn1=ij)X$_n&w>T?DTGInB(JI*UP$`IF%s)h@!}+
zPpgrL+Sv&n4{)B}D><jZpmyz=cVHkJkDG~vIX8FEo+}swO4asuH4;%eI>6%r#_}%<
zK>`8a&70nf7qjuWl}OkN3l8Zyx^JK)c?JfQa9C<;LRl7tz(rm~VHj*}EpY$7(%t?0
zcyf3+8;j9k5GXC-1S#d|v^6thjE$L-la-O-y?ohs{W|34vS@4}fH6=MsinmejVh4{
z9^4)BWHLK8W+oDBaS;Fx>>~+5LU<;VeDR|64h{~JN{vPZ=fzJY+Xh7RdgZfcJ-xkB
zOAAVe_#}S6HZ<hv@3*F=jE^7f`FU=dNXY&!hI7F=sjpYUVQXflbe%YoQJfiL06?3Y
zmG*W|PY-EqbmFQ2Qdg%&qiT1z_2Y-}`Li`W&DPgZlJ<8Zh$zd4dUICdzbBFqN@u5f
z{=C%Ooa?4sf)Kf_O>S#rYiri@bar%<t*q=%GY2iRGa0#_v@lP$t@ii(ZrnIDf1HB`
zgESbF&zwoWer+!<?kL$E_h2|W{)DdcbUOb@rHJ3}8yc#hh5~3X=p7v7rnwU?ofg^b
zp@xpAY(9Hdm=X?f;?X1gFNsu|P;0CH?p^lNr=2Ab;?U)AHlus@D5<HbTyoAqG>!Ot
zx&5OIt0Q9bhv6o_`TDy3^Jm4W6d(+vToYG+eiGv1o>>M8-I`;#+HK0eWF9q+No~|*
xR1<14stGk2)r6XiYC=s$HK8V>ns7{H{0qLsIAp#Q^6~%x002ovPDHLkV1g{NpE3Xd

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/header_people_view.xml b/astrid/res/layout/header_people_view.xml
index b25ced504..4d049fd58 100644
--- a/astrid/res/layout/header_people_view.xml
+++ b/astrid/res/layout/header_people_view.xml
@@ -8,7 +8,7 @@
         android:id="@+id/main_menu"
         android:layout_width="51dip"
         android:layout_height="fill_parent"
-        android:src="?attr/asMainMenu"
+        android:src="?attr/asPeopleMenu"
         android:scaleType="fitCenter"/>
     
     <View
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index b1b30f85c..0c800d5ec 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -30,6 +30,7 @@
   <attr name="asTaskEditArrow" format="reference" />
   <attr name="asRepeatIcon" format="reference" />
   <attr name="asMainMenu" format="reference" />
+  <attr name="asPeopleMenu" format="reference" />
   <attr name="asAbBackgroundColor" format="color"/>
   <attr name="asListPopoverBg" format="reference"/>
   <attr name="asListArrowUp" format="reference"/>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 31d0ffb9c..15e8fbdc8 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -27,6 +27,7 @@
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
         <item name="asMainMenu">@drawable/menu_button_blue</item>
+        <item name="asPeopleMenu">@drawable/people_menu_button_blue</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_blue</item>
         <item name="asAbBackgroundColor">#000000</item>
@@ -75,6 +76,7 @@
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenu">@drawable/menu_button_red</item>
+        <item name="asPeopleMenu">@drawable/people_menu_button_red</item>
         <item name="asThemeTextColor">@color/red_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
         <item name="asTaskEditArrow">@drawable/taskedit_arrow_up_white</item>
@@ -96,6 +98,7 @@
         <item name="asCommentButtonImg">@drawable/comment_dark_blue</item>
         <item name="asFilledCommentButtonImg">@drawable/comment_dark_blue_filled</item>
         <item name="asMainMenu">@drawable/menu_button_dark_blue</item>
+        <item name="asPeopleMenu">@drawable/people_menu_button_dark_blue</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_dark_blue</item>
         <item name="asRepeatIcon">@drawable/icn_edit_repeats_dark_blue</item>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index dcbc1d61b..dedaee407 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -723,6 +723,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     private void setupMainMenuForPeopleViewState(boolean inPeopleMode) {
         mainMenuPopover.setFixedItemVisibility(0, inPeopleMode ? View.VISIBLE : View.GONE, true);
         mainMenuPopover.setFixedItemVisibility(1, inPeopleMode ? View.GONE : View.VISIBLE, true);
+
+        TypedValue tv = new TypedValue();
+        getTheme().resolveAttribute(inPeopleMode ? R.attr.asPeopleMenu : R.attr.asMainMenu, tv, false);
+        mainMenu.setImageResource(tv.data);
     }
 
     public MainMenuPopover getMainMenuPopover() {
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index 4211aeb8f..5ffc35635 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -138,6 +138,8 @@ public class ThemeService {
             return R.drawable.icn_menu_sort_by_size_dark;
         case R.drawable.icn_menu_search:
             return R.drawable.icn_menu_search_dark;
+        case R.drawable.icn_menu_friends:
+            return R.drawable.icn_menu_friends_dark;
         case R.drawable.icn_menu_lists:
             return R.drawable.icn_menu_lists_dark;
         case R.drawable.icn_menu_plugins:
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 7553a1c8f..8c9db62e0 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -101,7 +101,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
                 ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
                 MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
         addMenuItem(R.string.TLA_menu_friends,
-                R.drawable.icn_anyone,
+                ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags),
                 MAIN_MENU_ITEM_FRIENDS, null, topFixed);
         addMenuItem(R.string.TLA_menu_search,
                 ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),

From 4dd8bff567c6234cfaff668b7fbcf378648d962b Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 9 May 2012 19:25:37 -0700
Subject: [PATCH 13/13] Added a default people filter that shows all the tasks
 you have shared with anyone

---
 .../astrid/people/PeopleFilterExposer.java    | 58 +++++++++++++++++--
 .../astrid/people/PeopleViewActivity.java     |  3 +-
 .../astrid/people/PersonViewFragment.java     | 37 +++++++-----
 astrid/res/values/strings-actfm.xml           |  6 ++
 .../astrid/activity/TaskListActivity.java     |  9 +--
 5 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
index b204f79de..9a0775fae 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
@@ -10,12 +10,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Field;
+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.AndroidUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
@@ -23,13 +27,16 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.api.FilterWithUpdate;
 import com.todoroo.astrid.core.PluginServices;
+import com.todoroo.astrid.data.Metadata;
+import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.User;
+import com.todoroo.astrid.tags.TagService;
 
 public class PeopleFilterExposer extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        FilterListItem[] listAsArray = prepareFilters();
+        FilterListItem[] listAsArray = prepareFilters(context);
 
         Intent broadcastIntent = new Intent(PeopleFilterAdapter.BROADCAST_SEND_PEOPLE_FILTERS);
         broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, listAsArray);
@@ -37,13 +44,14 @@ public class PeopleFilterExposer extends BroadcastReceiver {
         context.sendBroadcast(broadcastIntent);
     }
 
-    private FilterListItem[] prepareFilters() {
+    private FilterListItem[] prepareFilters(Context context) {
         TodorooCursor<User> users = PluginServices.getUserDao().query(Query.select(User.PROPERTIES)
                 .orderBy(Order.asc(User.NAME), Order.asc(User.EMAIL)));
         try {
-            FilterListItem[] items = new FilterListItem[users.getCount()];
+            FilterListItem[] items = new FilterListItem[users.getCount() + 1];
+            items[0] = mySharedTasks(context);
             User user = new User();
-            int i = 0;
+            int i = 1;
             for (users.moveToFirst(); !users.isAfterLast(); users.moveToNext()) {
                 user.readFromCursor(users);
                 Filter currFilter = filterFromUserData(user);
@@ -89,4 +97,46 @@ public class PeopleFilterExposer extends BroadcastReceiver {
 
         return filter;
     }
+
+    @SuppressWarnings("nls")
+    public static FilterWithCustomIntent mySharedTasks(Context context) {
+        AndroidUtilities.copyDatabases(context, "/sdcard/databases");
+        TodorooCursor<TagData> tagsWithMembers = PluginServices.getTagDataService()
+                .query(Query.select(TagData.NAME, TagData.MEMBERS).where(TagData.MEMBER_COUNT.gt(0)));
+        String[] names;
+        try {
+            if (tagsWithMembers.getCount() == 0) {
+                names = new String[1];
+                names[0] = "\"\"";
+            } else {
+                names = new String[tagsWithMembers.getCount()];
+                TagData curr = new TagData();
+                int i = 0;
+                for (tagsWithMembers.moveToFirst(); !tagsWithMembers.isAfterLast(); tagsWithMembers.moveToNext()) {
+                    curr.readFromCursor(tagsWithMembers);
+                    names[i] = "\"" + curr.getValue(TagData.NAME) + "\"";
+                    System.err.println("Tag data " + curr.getValue(TagData.NAME) + " has members " + curr.getValue(TagData.MEMBERS));
+                    i++;
+                }
+            }
+        } finally {
+            tagsWithMembers.close();
+        }
+
+        String title = context.getString(R.string.actfm_my_shared_tasks_title);
+        QueryTemplate template = new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"),
+                Criterion.and(Task.ID.eq(Field.field("mtags." + Metadata.TASK.name)),
+                        Field.field("mtags." + Metadata.KEY.name).eq(TagService.KEY),
+                        Field.field("mtags." + TagService.TAG.name).in(names))));
+
+        FilterWithUpdate filter = new FilterWithUpdate(title, title, template, null);
+
+        filter.customTaskList = new ComponentName(ContextManager.getContext(), PersonViewFragment.class);
+
+        Bundle extras = new Bundle();
+        extras.putBoolean(PersonViewFragment.EXTRA_HIDE_QUICK_ADD, true);
+        filter.customExtras = extras;
+
+        return filter;
+    }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java
index 27272f3b4..3204a539e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleViewActivity.java
@@ -33,8 +33,7 @@ public class PeopleViewActivity extends TaskListActivity {
 
     @Override
     protected Filter getDefaultFilter() {
-        // TODO More suitable default
-        return super.getDefaultFilter();
+        return PeopleFilterExposer.mySharedTasks(this);
     }
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
index 954f9dd2b..d1e1792ef 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -25,6 +25,8 @@ public class PersonViewFragment extends TaskListFragment {
 
     public static final String EXTRA_USER_ID_LOCAL = "user_local_id"; //$NON-NLS-1$
 
+    public static final String EXTRA_HIDE_QUICK_ADD = "hide_quickAdd"; //$NON-NLS-1$
+
     private static final String LAST_FETCH_KEY = "actfm_last_user_"; //$NON-NLS-1$
 
     protected static final int MENU_REFRESH_ID = MENU_SUPPORT_ID + 1;
@@ -54,8 +56,8 @@ public class PersonViewFragment extends TaskListFragment {
         super.initializeData();
         if (extras.containsKey(EXTRA_USER_ID_LOCAL)) {
             user = userDao.fetch(extras.getLong(EXTRA_USER_ID_LOCAL), User.PROPERTIES);
-            ((TextView)taskListView.findViewById(android.R.id.empty)).setText(getEmptyDisplayString());
         }
+        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(getEmptyDisplayString());
     }
 
     @Override
@@ -65,6 +67,9 @@ public class PersonViewFragment extends TaskListFragment {
         if (user != null)
             quickAddBar.getQuickAddBox().setHint(getString(R.string.TLA_quick_add_hint_assign, user.getDisplayName()));
 
+        if (extras.containsKey(EXTRA_HIDE_QUICK_ADD))
+            quickAddBar.setVisibility(View.GONE);
+
     }
 
     @Override
@@ -99,24 +104,26 @@ public class PersonViewFragment extends TaskListFragment {
     }
 
     private void refreshData(final boolean manual) {
-        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
-
-        syncService.synchronizeList(user, manual, new ProgressBarSyncResultCallback(getActivity(), this,
-                R.id.progressBar, new Runnable() {
-            @Override
-            public void run() {
-                if (manual)
-                    ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
-                else
-                    refresh();
-                ((TextView)taskListView.findViewById(android.R.id.empty)).setText(getEmptyDisplayString());
-            }
-        }));
+        if (user != null) {
+            ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
+
+            syncService.synchronizeList(user, manual, new ProgressBarSyncResultCallback(getActivity(), this,
+                    R.id.progressBar, new Runnable() {
+                @Override
+                public void run() {
+                    if (manual)
+                        ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
+                    else
+                        refresh();
+                    ((TextView)taskListView.findViewById(android.R.id.empty)).setText(getEmptyDisplayString());
+                }
+            }));
+        }
     }
 
     private String getEmptyDisplayString() {
         String userName = user != null ? user.getDisplayName() : null;
-        return TextUtils.isEmpty(userName) ? getString(R.string.TLA_no_items) : getString(R.string.TLA_no_items_person, userName);
+        return TextUtils.isEmpty(userName) ? getString(R.string.actfm_my_shared_tasks_empty) : getString(R.string.TLA_no_items_person, userName);
     }
 
 }
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 83f0dfbb8..e20f85604 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -45,6 +45,12 @@
       
   <!-- Cancel button for task view prompt -->
   <string name="actfm_view_task_cancel">Stay Here</string>
+  
+  <!-- Title for the "My Shared Tasks" filter -->
+  <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
+  
+  <!-- Empty list for the "My Shared Tasks" filter -->
+  <string name="actfm_my_shared_tasks_empty">No shared tasks</string>
 
   <!-- ================================================== TagViewActivity == -->  
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index dedaee407..f42948f68 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -154,7 +154,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         int contentView = getContentView();
         if (contentView == R.layout.task_list_wrapper_activity)
             swipeEnabled = true;
-        setContentView(getContentView());
+        setContentView(contentView);
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
@@ -176,6 +176,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         if (extras != null)
             extras = (Bundle) extras.clone();
 
+
         Filter savedFilter = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
         if (Intent.ACTION_SEARCH.equals(getIntent().getAction())) {
             String query = getIntent().getStringExtra(SearchManager.QUERY).trim();
@@ -185,14 +186,14 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
                             "%" + //$NON-NLS-1$
                                     query.toUpperCase() + "%")), //$NON-NLS-1$
                     null);
-            if (extras == null)
-                extras = new Bundle();
-            extras.putParcelable(TaskListFragment.TOKEN_FILTER, savedFilter);
         }
 
         if (savedFilter == null)
             savedFilter = getDefaultFilter();
 
+        if (extras == null)
+            extras = new Bundle();
+        extras.putParcelable(TaskListFragment.TOKEN_FILTER, savedFilter);
 
         if (swipeIsEnabled()) {
             FilterListFragment flf = getFilterListFragment();