From ada52d90e1969dd225a5d2320097fd7554479bb8 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Tue, 21 Feb 2012 19:17:39 -0800
Subject: [PATCH 1/5] Tag settings redesign

---
 .../astrid/actfm/EditPeopleControlSet.java    |   6 +-
 .../astrid/actfm/TagSettingsActivity.java     |  31 +-
 .../astrid/actfm/sync/ActFmInvoker.java       |   6 +-
 astrid/res/layout/contact_edit_row.xml        |  64 ++-
 astrid/res/layout/tag_settings_activity.xml   | 392 +++++++++---------
 astrid/res/values/strings-actfm.xml           |  11 +-
 astrid/res/values/strings-core.xml            |   2 +-
 .../todoroo/astrid/ui/PeopleContainer.java    |  20 +-
 8 files changed, 264 insertions(+), 268 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 17d8690bf..71f730b82 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -167,7 +167,7 @@ public class EditPeopleControlSet extends PopupControlSet {
         cbFacebook = (CheckBox) getSharedWithView().findViewById(R.id.checkbox_facebook);
         cbTwitter = (CheckBox) getSharedWithView().findViewById(R.id.checkbox_twitter);
 
-        sharedWithContainer.addPerson(""); //$NON-NLS-1$
+        sharedWithContainer.addPerson("", ""); //$NON-NLS-1$
         setUpListeners();
     }
 
@@ -206,7 +206,7 @@ public class EditPeopleControlSet extends PopupControlSet {
             if(people != null) {
                 for(int i = 0; i < people.length(); i++) {
                     String person = people.getString(i);
-                    TextView textView = sharedWithContainer.addPerson(person);
+                    TextView textView = sharedWithContainer.addPerson(person, "");
                     textView.setEnabled(false);
                     sharedPeople.add(PeopleContainer.createUserJson(textView));
                 }
@@ -681,7 +681,7 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     private void makePrivateTask() {
         sharedWithContainer.removeAllViews();
-        sharedWithContainer.addPerson(""); //$NON-NLS-1$
+        sharedWithContainer.addPerson("", ""); //$NON-NLS-1$
         assignToMe();
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 1c05bba52..956924b2b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -6,7 +6,6 @@ import java.io.IOException;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import android.app.Activity;
 import android.content.Context;
@@ -24,10 +23,10 @@ import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.ToggleButton;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
@@ -80,7 +79,7 @@ public class TagSettingsActivity extends FragmentActivity {
     private AsyncImageView picture;
     private EditText tagName;
     private EditText tagDescription;
-    private CheckBox isSilent;
+    private ToggleButton isSilent;
     private Bitmap setBitmap;
 
     private boolean isNewTag = false;
@@ -167,15 +166,14 @@ public class TagSettingsActivity extends FragmentActivity {
         tagName = (EditText) findViewById(R.id.tag_name);
         tagDescription = (EditText) findViewById(R.id.tag_description);
         picture = (AsyncImageView) findViewById(R.id.picture);
-        isSilent = (CheckBox) findViewById(R.id.tag_silenced);
+        isSilent = (ToggleButton) findViewById(R.id.tag_silenced);
         isSilent.setChecked(tagData.getFlag(TagData.FLAGS, TagData.FLAG_SILENT));
 
         if(actFmPreferenceService.isLoggedIn()) {
             picture.setVisibility(View.VISIBLE);
-            picture.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagData.getValue(TagData.NAME)));
-            findViewById(R.id.picture_label).setVisibility(View.VISIBLE);
-            findViewById(R.id.listSettingsMore).setVisibility(View.VISIBLE);
+            findViewById(R.id.tag_silenced_container).setVisibility(View.VISIBLE);
         }
+        picture.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagData.getValue(TagData.NAME)));
 
         picture.setOnClickListener(new OnClickListener() {
             @Override
@@ -268,7 +266,7 @@ public class TagSettingsActivity extends FragmentActivity {
                 public void onClick(DialogInterface d, int which) {
 
                     tagMembers.removeAllViews();
-                    tagMembers.addPerson(""); //$NON-NLS-1$
+                    tagMembers.addPerson("", ""); //$NON-NLS-1$
                 }
             };
             DialogUtilities.okCancelCustomDialog(TagSettingsActivity.this, getString(R.string.actfm_EPA_login_button),
@@ -367,21 +365,6 @@ public class TagSettingsActivity extends FragmentActivity {
         }
         picture.setUrl(tagData.getValue(TagData.PICTURE));
 
-        TextView ownerLabel = (TextView) findViewById(R.id.tag_owner);
-        try {
-            if(tagData.getFlag(TagData.FLAGS, TagData.FLAG_EMERGENT)) {
-                ownerLabel.setText(String.format("<%s>", getString(R.string.actfm_TVA_tag_owner_none)));
-            } else if(tagData.getValue(TagData.USER_ID) == 0) {
-                ownerLabel.setText(Preferences.getStringValue(ActFmPreferenceService.PREF_NAME));
-            } else {
-                JSONObject owner = new JSONObject(tagData.getValue(TagData.USER));
-                ownerLabel.setText(owner.getString("name"));
-            }
-        } catch (JSONException e) {
-            Log.e("tag-view-activity", "json error refresh owner", e);
-            ownerLabel.setText("<error>");
-        }
-
         String peopleJson = tagData.getValue(TagData.MEMBERS);
         updateMembers(peopleJson);
 
@@ -401,7 +384,7 @@ public class TagSettingsActivity extends FragmentActivity {
             }
         }
 
-        tagMembers.addPerson(""); //$NON-NLS-1$
+        tagMembers.addPerson("", ""); //$NON-NLS-1$
     }
 
     private void uploadTagPicture(final Bitmap bitmap) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
index 464c30965..30ba3aef8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -26,9 +26,9 @@ import com.todoroo.andlib.utility.Preferences;
 public class ActFmInvoker {
 
     /** NOTE: these values are development values & will not work on production */
-    private static final String URL = "//10.0.2.2:3000/api/";
-    private static final String APP_ID = "a4732a32859dbcd3e684331acd36432c";
-    private static final String APP_SECRET = "e389bfc82a0d932332f9a8bd8203735f";
+    private static final String URL = "//astrid.com/api/";
+    private static final String APP_ID = "bf6170638298af8ed9a8c79995b1fc0f";
+    private static final String APP_SECRET = "d15d25c63323bddcaa48928dccac1207";
 
     public static final String PROVIDER_FACEBOOK = "facebook";
     public static final String PROVIDER_GOOGLE= "google";
diff --git a/astrid/res/layout/contact_edit_row.xml b/astrid/res/layout/contact_edit_row.xml
index 3f2e193d6..2fa069eb9 100644
--- a/astrid/res/layout/contact_edit_row.xml
+++ b/astrid/res/layout/contact_edit_row.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,24 +15,49 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-    
-   <com.todoroo.astrid.ui.ContactsAutoComplete
-        android:id="@+id/text1"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical"
-        android:textColor="@android:color/black"
-        android:hint="@string/actfm_person_hint" />
-        
-    <ImageButton android:id="@+id/button1"
-        android:background="@drawable/btn_dismiss"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:layout_gravity="center"
-        android:layout_margin="4dip"
-    />
-</LinearLayout>
+        android:orientation="horizontal" >
+
+        <greendroid.widget.AsyncImageView
+            android:id="@+id/icon"
+            android:layout_width="31dip"
+            android:layout_height="35dip"
+            astrid:defaultSrc="@drawable/icn_default_person_image"
+            android:gravity="center"
+            android:layout_margin="5dip"
+            android:scaleType="fitCenter" />
+
+        <com.todoroo.astrid.ui.ContactsAutoComplete
+            android:id="@+id/text1"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:layout_marginLeft="5dip"
+            android:background="#00000000"
+            android:hint="@string/actfm_person_hint"
+            android:textColor="@android:color/black" />
+
+        <ImageButton
+            android:id="@+id/button1"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:layout_gravity="center"
+            android:layout_margin="4dip"
+            android:background="@drawable/btn_dismiss" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/divider"
+        style="@style/TEA_Separator"
+        android:layout_width="fill_parent"
+        android:layout_height="1dip" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 6622ad966..4634566b2 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -1,221 +1,199 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- settings tab -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
     android:id="@+id/settings"
-    android:orientation="vertical"
+    style="@style/Content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    style="@style/Content">
-    
-
-	<ScrollView
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_weight="100">
-	                
-		<LinearLayout 
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:padding="5dip"
-		    android:orientation="vertical">
-		
-		    <RelativeLayout
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:paddingBottom="10dip">
-		      
-		        <TextView 
-		            android:id="@+id/tag_label"
-		            android:layout_width="wrap_content"
-		            android:layout_height="wrap_content"
-		            android:layout_alignParentTop="true"
-		            android:layout_marginTop="10dip"
-		            style="@style/TextAppearance.GEN_EditLabel"
-		            android:text="@string/actfm_TVA_tag_label" />
-			    <LinearLayout
-			        android:id="@+id/save_and_cancel"
-			        android:layout_width="fill_parent"
-			        android:layout_height="wrap_content"
-			        android:layout_toRightOf="@id/tag_label"
-			        android:layout_alignParentRight="true"
-			        android:orientation="horizontal"
-			        android:gravity="right"
-			        android:visibility="gone">
-			        
-			        <ImageButton
-			            android:id="@+id/cancel"
-			            android:layout_width="wrap_content"
-			            android:layout_height="wrap_content"
-			            android:layout_marginRight="10dip"
-			            android:background="@android:color/transparent"
-			            android:src="@android:drawable/ic_menu_close_clear_cancel"/>
-			        <ImageButton
-			            android:id="@+id/save"
-			            android:layout_width="wrap_content"
-			            android:layout_height="wrap_content"
-			            android:layout_marginRight="10dip"
-			            android:background="@android:color/transparent"
-			            android:src="@android:drawable/ic_menu_save"/>
-			    </LinearLayout>
-		          
-		        <EditText
-		            android:id="@+id/tag_name"
-		            android:layout_width="fill_parent"
-		            android:layout_height="wrap_content" 
-		            android:layout_below="@id/tag_label"
-		            android:layout_marginTop="10dip" />
-		          
-		    </RelativeLayout>
-		  
-		    <View
-		        android:layout_width="fill_parent"
-		        android:layout_height="1dip"
-		        android:background="@android:drawable/divider_horizontal_dark" />
-		        
-		    <TextView 
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:paddingTop="10dip"
-		        android:paddingBottom="5dip"
-		        style="@style/TextAppearance.GEN_EditLabel"
-		        android:text="@string/actfm_TVA_members_label" />
-		    
-		    <com.todoroo.astrid.ui.PeopleContainer
-		        android:id="@+id/members_container"
-		        android:orientation="vertical"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content" />
-		    
-		    <View
-		        android:layout_width="fill_parent"
-		        android:layout_height="1dip"
-		        android:background="@android:drawable/divider_horizontal_dark" />
-		    
-		    <RelativeLayout
-		        android:orientation="horizontal"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:gravity="center_vertical">
-		    
-                <TextView
-                    android:id="@+id/picture_label"
+    android:orientation="vertical" >
+
+    <ScrollView
+        style="@style/Content_EditScroll"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="100" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:padding="5dip"
+            android:paddingTop="0dip" >
+
+            <LinearLayout
+                android:id="@+id/save_and_cancel"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="horizontal"
+                android:visibility="gone" >
+
+                <ImageButton
+                    android:id="@+id/cancel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginTop="10dip"
-                    android:visibility="gone"
-                    style="@style/TextAppearance.GEN_EditLabel"
-                    android:text="@string/actfm_TVA_list_icon_label"/>
-                
-                <greendroid.widget.AsyncImageView 
+                    android:layout_marginRight="10dip"
+                    android:background="@android:color/transparent"
+                    android:src="@android:drawable/ic_menu_close_clear_cancel" />
+
+                <ImageButton
+                    android:id="@+id/save"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dip"
+                    android:background="@android:color/transparent"
+                    android:src="@android:drawable/ic_menu_save" />
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="10dip" >
+
+                <!-- picture -->
+
+                <greendroid.widget.AsyncImageView
                     android:id="@+id/picture"
                     android:layout_width="80dip"
                     android:layout_height="80dip"
                     android:layout_alignParentLeft="true"
-                    android:scaleType="centerInside"
+                    android:layout_alignParentTop="true"
+                    astrid:defaultSrc="@android:drawable/ic_menu_gallery"
                     android:paddingRight="10dip"
-                    android:visibility="gone"
-                    android:layout_below="@id/picture_label"
-                    astrid:defaultSrc="@android:drawable/ic_menu_gallery" />
-                
-			    <TextView 
-		            android:id="@+id/description_label"
-		            android:layout_width="wrap_content"
-		            android:layout_height="wrap_content"
-		            android:layout_alignParentTop="true"
-		            android:layout_toRightOf="@id/picture"
-		            android:layout_marginTop="10dip"
-		            style="@style/TextAppearance.GEN_EditLabel"
-		            android:text="@string/actfm_TVA_tag_description_label" />
-			    <EditText
-		            android:id="@+id/tag_description"
-		            android:layout_width="fill_parent"
-		            android:layout_height="wrap_content" 
-		            android:layout_toRightOf="@id/picture"
-		            android:layout_below="@id/description_label"
-		            android:layout_marginTop="10dip" 
-		            android:hint="@string/actfm_TVA_tag_description_hint" />
-			    
-	            <View
-	                android:id="@+id/divider"
-	                android:layout_width="fill_parent"
-	                android:layout_height="1dip"
-		            android:layout_marginTop="25dip"
-		            android:layout_below="@id/tag_description"
-	                style="@style/TEA_Separator" />
-	            
-			    <!-- Footer -->
-		        <LinearLayout
-		            android:id="@+id/listSettingsMore"
-		            android:layout_width="wrap_content" 
-		            android:layout_height="wrap_content"
-		            android:layout_alignParentLeft="true"
-		            android:layout_below="@id/divider"
-		            android:orientation="vertical"
-		            android:visibility="gone">
-		            
-		    
-		            <TextView 
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content"
-		                android:layout_marginTop="10dip"
-		                style="@style/TextAppearance.GEN_EditLabel"
-		                android:text="@string/actfm_TVA_tag_owner_label" />
-		              
-		            <TextView
-		                android:id="@+id/tag_owner"
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content" 
-		                android:layout_marginBottom="10dip" 
-		                android:textSize="20sp"/>
-		    
-		            <CheckBox 
-		                android:id="@+id/tag_silenced"
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content"
-		                android:layout_marginTop="10dip"
-		                android:paddingLeft="45dip"
-		                style="@style/TextAppearance"
-		                android:text="@string/actfm_TVA_silence_label" />
-		                
-		        </LinearLayout>
-		        
-		        <LinearLayout
-			        android:id="@+id/create_shortcut_container"
-		            android:layout_width="wrap_content" 
+                    android:scaleType="centerInside" />
+
+                <TextView
+                    android:id="@+id/tag_label"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginTop="2dip"
+                    android:layout_toRightOf="@id/picture"
+                    android:text="@string/actfm_TVA_tag_label" />
+
+                <EditText
+                    android:id="@+id/tag_name"
+                    style="@style/EditRow"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/divider"
-		            android:layout_alignParentRight="true"
-		            android:gravity="right"
-                    android:orientation="vertical">
-		            
-			        <TextView
-			            android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_marginTop="10dip"
-	                    style="@style/TextAppearance.GEN_EditLabel"
-	                    android:text="@string/FLA_shortcut_dialog_title" />
-			        
-			        <ImageButton 
-				        android:id="@+id/create_shortcut"
-			            android:layout_width="75dip"
-			            android:maxWidth="50dip"
-			            android:layout_height="50dip"
-			            android:maxHeight="50dip"
-			            android:background="@android:color/transparent"
-			            android:src="@android:drawable/ic_media_ff"
-			            android:scaleType="fitCenter"/>
-
-		      </LinearLayout>
-			    
-		    </RelativeLayout>
-		    
-		                            
-	    </LinearLayout>
-	  
-	</ScrollView>
-	
-</LinearLayout>
-	
+                    android:layout_below="@id/tag_label"
+                    android:layout_marginTop="10dip"
+                    android:layout_toRightOf="@id/picture"
+                    android:padding="10dip"
+                    android:paddingBottom="14dip" />
+            </RelativeLayout>
+
+            <TextView
+                style="@style/TextAppearance"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="10dip"
+                android:paddingBottom="5dip"
+                android:text="@string/actfm_TVA_members_label" />
+
+            <com.todoroo.astrid.ui.PeopleContainer
+                android:id="@+id/members_container"
+                style="@style/EditRow"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+
+            <TextView
+                android:id="@+id/description_label"
+                style="@style/TextAppearance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="10dip"
+                android:text="@string/actfm_TVA_tag_description_label" />
+
+            <EditText
+                android:id="@+id/tag_description"
+                style="@style/EditRow"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:hint="@string/actfm_TVA_tag_description_hint"
+                android:padding="8dip"
+                android:paddingBottom="12dip" />
+
+            <!-- Footer -->
+
+            <TextView
+                android:id="@+id/settings_label"
+                style="@style/TextAppearance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="10dip"
+                android:text="@string/actfm_TVA_tag_settings_label" />
+
+            <LinearLayout
+                style="@style/EditRow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:orientation="vertical" >
+
+                <RelativeLayout
+                    android:id="@+id/tag_silenced_container"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="5dip" >
+
+                    <TextView
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginTop="10dip"
+                        android:text="@string/actfm_TVA_silence_label" />
+
+                    <ToggleButton
+                        android:id="@+id/tag_silenced"
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dip"
+                        android:background="#00000000"
+                        android:layout_alignParentRight="true" />
+                </RelativeLayout>
+
+                <View
+                    android:id="@+id/divider"
+                    style="@style/TEA_Separator"
+                    android:layout_width="fill_parent"
+                    android:layout_height="1dip" />
+
+                <RelativeLayout
+                    android:id="@+id/create_shortcut_container"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="5dip" >
+
+                    <TextView
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginTop="10dip"
+                        android:text="@string/FLA_shortcut_dialog_title" />
+
+                    <ImageButton
+                        android:id="@+id/create_shortcut"
+                        android:layout_width="40dip"
+                        android:layout_height="40dip"
+                        android:layout_alignParentRight="true"
+                        android:background="@android:color/transparent"
+                        android:scaleType="fitCenter"
+                        android:src="@android:drawable/ic_media_ff" />
+                </RelativeLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 95ffd7003..714c1c523 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -80,7 +80,7 @@
   <string name="actfm_TVA_menu_refresh">Refresh</string>
 
   <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">List Name:</string>
+  <string name="actfm_TVA_tag_label">List</string>
 
   <!-- Tag Settings: tag owner label -->
   <string name="actfm_TVA_tag_owner_label">List Creator:</string>
@@ -89,7 +89,7 @@
   <string name="actfm_TVA_tag_owner_none">none</string>
 
   <!-- Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Shared With:</string>
+  <string name="actfm_TVA_members_label">Shared With</string>
 
   <!-- Tag Settings: tag picture -->
   <string name="actfm_TVA_tag_picture">List Picture</string>
@@ -101,10 +101,13 @@
   <string name="actfm_TVA_list_icon_label">List Icon:</string>
   
   <!-- Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Description:</string>
+  <string name="actfm_TVA_tag_description_label">Description</string>
+  
+  <!-- Tag Settings: list settings label -->
+  <string name="actfm_TVA_tag_settings_label">Settings</string>
 
   <!-- Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">List description</string>
+  <string name="actfm_TVA_tag_description_hint">Type a description here</string>
   
   <!-- Tag settings: login prompt from share-->
   <string name="actfm_TVA_login_to_share">You need to be logged in to Astrid.com to share lists! Please log in or make this a private list.</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 1efa92c23..20d7fb3c7 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -273,7 +273,7 @@
   <string name="FLA_menu_help">Help</string>
   
   <!-- Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Create Shortcut</string>
+  <string name="FLA_shortcut_dialog_title">Create Desktop Shortcut</string>
   
   <!-- Create Shortcut Dialog (asks to name shortcut) -->    
   <string name="FLA_shortcut_dialog">Name of shortcut:</string>
diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
index 2c0df68a4..48ce6e69a 100644
--- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
+++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
@@ -1,5 +1,7 @@
 package com.todoroo.astrid.ui;
 
+import greendroid.widget.AsyncImageView;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -55,7 +57,7 @@ public class PeopleContainer extends LinearLayout {
     // --- methods
 
     /** Adds a tag to the tag field */
-    public TextView addPerson(String person) {
+    public TextView addPerson(String person, String image) {
         LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
         // check if already exists
@@ -81,6 +83,10 @@ public class PeopleContainer extends LinearLayout {
             textView.setHint(R.string.actfm_person_or_tag_hint);
         }
 
+        final AsyncImageView imageView = (AsyncImageView)tagItem.
+            findViewById(R.id.icon);
+        imageView.setUrl(image);
+
         textView.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
@@ -95,7 +101,7 @@ public class PeopleContainer extends LinearLayout {
             public void onTextChanged(CharSequence s, int start, int before,
                     int count) {
                 if(count > 0 && getLastTextView() == textView) {
-                    addPerson(""); //$NON-NLS-1$
+                    addPerson("", ""); //$NON-NLS-1$
                 }
 
                 if(onAddNewPerson != null)
@@ -109,7 +115,7 @@ public class PeopleContainer extends LinearLayout {
                 if(actionId != EditorInfo.IME_NULL)
                     return false;
                 if(getLastTextView().getText().length() != 0) {
-                    addPerson(""); //$NON-NLS-1$
+                    addPerson("", ""); //$NON-NLS-1$
                 }
                 return true;
             }
@@ -222,13 +228,13 @@ public class PeopleContainer extends LinearLayout {
         for(int i = 0; i < people.length(); i++) {
             JSONObject person = people.getJSONObject(i);
             TextView textView = null;
-
+            String imageURL = person.optString("picture", "");
             if(person.has("id") && person.getLong("id") == ActFmPreferenceService.userId())
-                textView = addPerson(Preferences.getStringValue(ActFmPreferenceService.PREF_NAME));
+                textView = addPerson(Preferences.getStringValue(ActFmPreferenceService.PREF_NAME), imageURL);
             else if(!TextUtils.isEmpty(person.optString("name")) && !"null".equals(person.optString("name")))
-                textView = addPerson(person.getString("name"));
+                textView = addPerson(person.getString("name"), imageURL);
             else if(!TextUtils.isEmpty(person.optString("email")) && !"null".equals(person.optString("email")))
-                textView = addPerson(person.getString("email"));
+                textView = addPerson(person.getString("email"), imageURL);
 
             if(textView != null) {
                 textView.setTag(person);

From ab8bfbeda6e695ff0b983cbcfc4adfdae02edb02 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Tue, 21 Feb 2012 22:59:07 -0800
Subject: [PATCH 2/5] Caching tag images

---
 api/src/com/todoroo/astrid/data/TagData.java  |  5 +++
 api/src/com/todoroo/astrid/data/Update.java   |  4 +++
 .../astrid/actfm/TagSettingsActivity.java     | 36 ++++++++++++++++---
 .../astrid/notes/EditNoteActivity.java        |  5 +--
 astrid/res/layout/tag_settings_activity.xml   |  1 +
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java
index 9ce7b5de6..78ed6ab37 100644
--- a/api/src/com/todoroo/astrid/data/TagData.java
+++ b/api/src/com/todoroo/astrid/data/TagData.java
@@ -203,4 +203,9 @@ public final class TagData extends RemoteModel {
             return getValue(DELETION_DATE) > 0;
     }
 
+    public String getPictureHash() {
+        String s = getValue(TagData.NAME) + "" + getValue(TagData.CREATION_DATE);
+        return s;
+    }
+
 }
diff --git a/api/src/com/todoroo/astrid/data/Update.java b/api/src/com/todoroo/astrid/data/Update.java
index 64fc5ca17..b0206d8a6 100644
--- a/api/src/com/todoroo/astrid/data/Update.java
+++ b/api/src/com/todoroo/astrid/data/Update.java
@@ -162,4 +162,8 @@ public class Update extends RemoteModel {
         return CREATOR;
     }
 
+    public String getPictureHash() {
+        String s = getValue(Update.TASK) + "" + getValue(Update.CREATION_DATE);
+        return s;
+    }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 956924b2b..6c583064d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -42,6 +42,7 @@ import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.activity.ShortcutActivity;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.data.TagData;
+import com.todoroo.astrid.helper.ImageDiskCache;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TagDataService;
@@ -81,12 +82,14 @@ public class TagSettingsActivity extends FragmentActivity {
     private EditText tagDescription;
     private ToggleButton isSilent;
     private Bitmap setBitmap;
+    private final ImageDiskCache imageCache;
 
     private boolean isNewTag = false;
     private boolean isDialog;
 
     public TagSettingsActivity() {
         DependencyInjectionService.getInstance().inject(this);
+        imageCache = ImageDiskCache.getInstance();
     }
 
     @Override
@@ -170,11 +173,10 @@ public class TagSettingsActivity extends FragmentActivity {
         isSilent.setChecked(tagData.getFlag(TagData.FLAGS, TagData.FLAG_SILENT));
 
         if(actFmPreferenceService.isLoggedIn()) {
-            picture.setVisibility(View.VISIBLE);
             findViewById(R.id.tag_silenced_container).setVisibility(View.VISIBLE);
         }
-        picture.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagData.getValue(TagData.NAME)));
 
+        picture.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagData.getValue(TagData.NAME)));
         picture.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View arg0) {
@@ -273,7 +275,7 @@ public class TagSettingsActivity extends FragmentActivity {
                     getString(R.string.actfm_TVA_login_to_share), R.string.actfm_EPA_login_button,
                     R.string.actfm_EPA_dont_share_button, android.R.drawable.ic_dialog_alert,
                     okListener, cancelListener);
-           Toast.makeText(this, R.string.tag_list_saved, Toast.LENGTH_LONG).show();
+            Toast.makeText(this, R.string.tag_list_saved, Toast.LENGTH_LONG).show();
 
             return;
 
@@ -314,7 +316,9 @@ public class TagSettingsActivity extends FragmentActivity {
                     public void run() {
                         actFmSyncService.pushTagDataOnSave(tagData, tagData.getMergedValues());
                         if(setBitmap != null && tagData.getValue(TagData.REMOTE_ID) > 0)
-                            uploadTagPicture(setBitmap);
+                                uploadTagPicture(setBitmap);
+
+
                         runOnUiThread(loadTag);
                     }
                 }).start();
@@ -332,6 +336,18 @@ public class TagSettingsActivity extends FragmentActivity {
         finish();
     }
 
+    private void saveTagPictureLocally(Bitmap bitmap) {
+        if (bitmap == null) return;
+        try {
+            String tagPicture = tagData.getPictureHash();
+            imageCache.put(tagPicture, bitmap);
+            tagData.setValue(TagData.PICTURE, tagPicture);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void finish() {
         finishWithAnimation(!isDialog);
@@ -363,6 +379,17 @@ public class TagSettingsActivity extends FragmentActivity {
                 setTitle(getString(R.string.tag_settings_title, tagData.getValue(TagData.NAME)));
             }
         }
+        String tagImage = tagData.getValue(TagData.PICTURE);
+        if(!TextUtils.isEmpty(tagImage) && imageCache.contains(tagImage)) {
+            try {
+                picture.setDefaultImageBitmap(imageCache.get(tagImage));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        else {
+            picture.setUrl(tagImage);
+        }
         picture.setUrl(tagData.getValue(TagData.PICTURE));
 
         String peopleJson = tagData.getValue(TagData.MEMBERS);
@@ -421,6 +448,7 @@ public class TagSettingsActivity extends FragmentActivity {
                 setBitmap = bitmap;
                 if(tagData.getValue(TagData.REMOTE_ID) > 0)
                     uploadTagPicture(bitmap);
+                saveTagPictureLocally(bitmap);
             }
         };
         if (ActFmCameraModule.activityResult(this, requestCode, resultCode, data, callback)) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 894d56626..55a44575d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -428,9 +428,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     }
 
 
-    private String getPictureHashForUpdate(Update u) {
-        return String.format("%s%s", u.getValue(Update.TASK), u.getValue(Update.CREATION_DATE)); //$NON-NLS-1$
-    }
     private void addComment(String message, String actionCode, boolean usePicture) {
         // Allow for users to just add picture
         if (TextUtils.isEmpty(message) && usePicture) {
@@ -448,7 +445,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         if (usePicture && pendingCommentPicture != null) {
             update.setValue(Update.PICTURE, Update.PICTURE_LOADING);
             try {
-                String updateString = getPictureHashForUpdate(update);
+                String updateString = update.getPictureHash();
                 imageCache.put(updateString, pendingCommentPicture);
                 update.setValue(Update.PICTURE, updateString);
             }
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 4634566b2..20d45df40 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -76,6 +76,7 @@
                 <EditText
                     android:id="@+id/tag_name"
                     style="@style/EditRow"
+                    android:maxLines="1"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tag_label"

From 599e7b75612241dc5f40947f40e2a3771f6e62f2 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Wed, 22 Feb 2012 00:59:48 -0800
Subject: [PATCH 3/5] Theming and UI changes

---
 api/src/com/todoroo/astrid/data/TagData.java  |   3 +-
 .../astrid/actfm/TagSettingsActivity.java     |  56 ++-
 .../todoroo/astrid/tags/TagFilterExposer.java |   1 +
 .../com/todoroo/astrid/tags/TagService.java   |  12 +
 astrid/res/drawable/icn_add_contact.png       | Bin 0 -> 282 bytes
 astrid/res/drawable/icn_list_shortcut.png     | Bin 0 -> 8678 bytes
 astrid/res/layout/tag_settings_activity.xml   | 330 +++++++++---------
 astrid/res/values/strings-tags.xml            |   8 +-
 astrid/res/values/styles.xml                  |  16 +
 .../astrid/activity/TaskListActivity.java     | 188 +++++-----
 .../todoroo/astrid/adapter/UpdateAdapter.java |   9 +-
 .../todoroo/astrid/ui/PeopleContainer.java    |  10 +
 12 files changed, 367 insertions(+), 266 deletions(-)
 create mode 100644 astrid/res/drawable/icn_add_contact.png
 create mode 100644 astrid/res/drawable/icn_list_shortcut.png

diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java
index 78ed6ab37..be2e379b5 100644
--- a/api/src/com/todoroo/astrid/data/TagData.java
+++ b/api/src/com/todoroo/astrid/data/TagData.java
@@ -204,8 +204,7 @@ public final class TagData extends RemoteModel {
     }
 
     public String getPictureHash() {
-        String s = getValue(TagData.NAME) + "" + getValue(TagData.CREATION_DATE);
-        return s;
+       return getId() + "" + getValue(TagData.CREATION_DATE);
     }
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 6c583064d..9ce64110b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -23,6 +23,7 @@ import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -33,6 +34,7 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
@@ -40,7 +42,9 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.activity.ShortcutActivity;
+import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.helper.ImageDiskCache;
 import com.todoroo.astrid.service.StatisticsConstants;
@@ -172,6 +176,20 @@ public class TagSettingsActivity extends FragmentActivity {
         isSilent = (ToggleButton) findViewById(R.id.tag_silenced);
         isSilent.setChecked(tagData.getFlag(TagData.FLAGS, TagData.FLAG_SILENT));
 
+        Button leaveListButton = (Button) findViewById(R.id.leave_list);
+        leaveListButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                showDeleteDialog(tagData);
+            }
+        });
+        if (isNewTag) {
+            leaveListButton.setVisibility(View.GONE);
+        }
+        else if (tagData.getValue(TagData.MEMBER_COUNT) > 0) {
+            leaveListButton.setText(getString(R.string.tag_leave_button));
+        }
         if(actFmPreferenceService.isLoggedIn()) {
             findViewById(R.id.tag_silenced_container).setVisibility(View.VISIBLE);
         }
@@ -370,13 +388,13 @@ public class TagSettingsActivity extends FragmentActivity {
             if (isNewTag) {
                 titleView.setText(getString(R.string.tag_new_list));
             } else {
-                titleView.setText(getString(R.string.tag_settings_title, tagData.getValue(TagData.NAME)));
+                titleView.setText(getString(R.string.tag_settings_title));
             }
         } else {
             if (isNewTag) {
                 setTitle(getString(R.string.tag_new_list));
             } else {
-                setTitle(getString(R.string.tag_settings_title, tagData.getValue(TagData.NAME)));
+                setTitle(getString(R.string.tag_settings_title));
             }
         }
         String tagImage = tagData.getValue(TagData.PICTURE);
@@ -492,6 +510,40 @@ public class TagSettingsActivity extends FragmentActivity {
 
 
 
+        protected void showDeleteDialog(TagData tagData) {
+            int string;
+            if (tagData != null && tagData.getValue(TagData.MEMBER_COUNT) > 0)
+                string = R.string.DLG_leave_this_shared_tag_question;
+            else
+                string = R.string.DLG_delete_this_tag_question;
+            DialogUtilities.okCancelDialog(this, getString(string, tagData.getValue(TagData.NAME)), new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    deleteTag();
+                }
+            }, null );
+        }
+
+        protected boolean deleteTag() {
+            tagDataService.delete(tagData.getId());
+            boolean shared = false;
+            if(tagData != null) {
+                tagData.setValue(TagData.DELETION_DATE, DateUtilities.now());
+                PluginServices.getTagDataService().save(tagData);
+                shared = tagData.getValue(TagData.MEMBER_COUNT) > 0 && tagData.getValue(TagData.USER_ID) != 0; // Was I a list member and NOT owner?
+            }
+
+            Intent tagDeleted = new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED);
+            tagDeleted.putExtra(TagViewFragment.EXTRA_TAG_NAME, tagData.getValue(TagData.NAME));
+            tagDeleted.putExtra(TagFilterExposer.TAG_SQL, TagFilterExposer.SHOW_ACTIVE_TASKS);
+
+            this.finish();
+            sendBroadcast(tagDeleted);
+
+            return true;
+        }
+
 
 
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index ab7e913eb..e3e13ba6c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -59,6 +59,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
 
     private static final String TAG = "tag"; //$NON-NLS-1$
     public static final String TAG_SQL = "tagSql"; //$NON-NLS-1$
+    public static final String SHOW_ACTIVE_TASKS = "show_main_task_view"; //$NON-NLS-1$
 
     @Autowired TagDataService tagDataService;
     @Autowired GtasksPreferenceService gtasksPreferenceService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index a332d381a..deed7b19c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -138,6 +138,18 @@ public final class TagService {
                             Field.field("mtags." + TAG.name).eqCaseInsensitive(tag)))).where(criterion);
         }
 
+
+        /**
+         * Return SQL selector query for getting tasks with a given tagData
+         *
+         * @param tagData
+         * @return
+         */
+        public static QueryTemplate queryTemplate(Criterion criterion, TagData tagData) {
+            return new QueryTemplate().join(Join.inner(Metadata.TABLE,
+                    Task.ID.eq(Metadata.TASK))).where(tagEqIgnoreCase(tagData.getValue(TagData.NAME), criterion));
+        }
+
     }
 
     public static Criterion memberOfTagData(long tagDataRemoteId) {
diff --git a/astrid/res/drawable/icn_add_contact.png b/astrid/res/drawable/icn_add_contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdbb282f2e76173a6b6c549b06b9c53ee748268c
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1<!3HE_Uh1g<DTQQ@AYTTCDpdxChGqtapZ|gM
zO9qBg0|tgy2@DKYGZ+}e^C!h0bpxv9EbxddW?<kJ24O~qS#v<9E%0=446!)<bc!SI
z0R<jcZAMOyhYbuWK3segj5sGZv8WhC>`GB&w6dC{YrThi;eWvl#<ivb8#*U+cpTW8
zr)z2xwjrib!!J&#;QR&$(?k9u?g^Yszw;XvIe4~rS1}!&+q_k9pPgYw+Lx*oOc@*x
zzB0L1G~b>)XLpikg%kVSiZz0|jXpchJ-?=$(6)zbQ)zO`wG%U$E=Z_9Oi221@H?w@
YeMN72$owfQfo^5+boFyt=akR{0JdRU@Bjb+

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/icn_list_shortcut.png b/astrid/res/drawable/icn_list_shortcut.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ba4786ce0280f6432b8338bb7b641364721773f
GIT binary patch
literal 8678
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
Q|L28)uBp!bGtQC!4^BIhXaE2J

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 20d45df40..76bf02035 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -1,200 +1,202 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- settings tab -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
     android:id="@+id/settings"
-    style="@style/Content"
+    style="@style/Content_EditScroll"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_weight="100" >
 
-    <ScrollView
-        style="@style/Content_EditScroll"
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="100" >
+        android:orientation="vertical"
+        android:padding="5dip"
+        android:paddingTop="0dip" >
 
         <LinearLayout
+            android:id="@+id/save_and_cancel"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical"
-            android:padding="5dip"
-            android:paddingTop="0dip" >
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:visibility="gone" >
 
-            <LinearLayout
-                android:id="@+id/save_and_cancel"
-                android:layout_width="fill_parent"
+            <ImageButton
+                android:id="@+id/cancel"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right"
-                android:orientation="horizontal"
-                android:visibility="gone" >
+                android:layout_marginRight="10dip"
+                android:background="@android:color/transparent"
+                android:src="@android:drawable/ic_menu_close_clear_cancel" />
 
-                <ImageButton
-                    android:id="@+id/cancel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dip"
-                    android:background="@android:color/transparent"
-                    android:src="@android:drawable/ic_menu_close_clear_cancel" />
-
-                <ImageButton
-                    android:id="@+id/save"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dip"
-                    android:background="@android:color/transparent"
-                    android:src="@android:drawable/ic_menu_save" />
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
+            <ImageButton
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="10dip" >
-
-                <!-- picture -->
-
-                <greendroid.widget.AsyncImageView
-                    android:id="@+id/picture"
-                    android:layout_width="80dip"
-                    android:layout_height="80dip"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    astrid:defaultSrc="@android:drawable/ic_menu_gallery"
-                    android:paddingRight="10dip"
-                    android:scaleType="centerInside" />
+                android:layout_marginRight="10dip"
+                android:background="@android:color/transparent"
+                android:src="@android:drawable/ic_menu_save" />
+        </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tag_label"
-                    style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginTop="2dip"
-                    android:layout_toRightOf="@id/picture"
-                    android:text="@string/actfm_TVA_tag_label" />
-
-                <EditText
-                    android:id="@+id/tag_name"
-                    style="@style/EditRow"
-                    android:maxLines="1"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tag_label"
-                    android:layout_marginTop="10dip"
-                    android:layout_toRightOf="@id/picture"
-                    android:padding="10dip"
-                    android:paddingBottom="14dip" />
-            </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="5dip"
+            android:paddingTop="5dip" >
+
+            <!-- picture -->
+
+            <greendroid.widget.AsyncImageView
+                android:id="@+id/picture"
+                android:layout_width="80dip"
+                android:layout_height="80dip"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                astrid:defaultSrc="@android:drawable/ic_menu_gallery"
+                android:paddingRight="10dip"
+                android:scaleType="centerInside" />
 
             <TextView
+                android:id="@+id/tag_label"
                 style="@style/TextAppearance"
-                android:layout_width="fill_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:layout_marginTop="10dip"
-                android:paddingBottom="5dip"
-                android:text="@string/actfm_TVA_members_label" />
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="2dip"
+                android:layout_toRightOf="@id/picture"
+                android:text="@string/actfm_TVA_tag_label" />
 
-            <com.todoroo.astrid.ui.PeopleContainer
-                android:id="@+id/members_container"
+            <EditText
+                android:id="@+id/tag_name"
                 style="@style/EditRow"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical" />
-
-            <TextView
-                android:id="@+id/description_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
+                android:layout_below="@id/tag_label"
                 android:layout_marginTop="10dip"
-                android:text="@string/actfm_TVA_tag_description_label" />
+                android:layout_toRightOf="@id/picture"
+                android:maxLines="1"
+                android:padding="10dip"
+                android:paddingBottom="14dip" />
+        </RelativeLayout>
+
+        <TextView
+            style="@style/TextAppearance"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
+            android:paddingBottom="5dip"
+            android:text="@string/actfm_TVA_members_label" />
+
+        <com.todoroo.astrid.ui.PeopleContainer
+            android:id="@+id/members_container"
+            style="@style/EditRow"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+        <TextView
+            android:id="@+id/description_label"
+            style="@style/TextAppearance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
+            android:text="@string/actfm_TVA_tag_description_label" />
+
+        <EditText
+            android:id="@+id/tag_description"
+            style="@style/EditRow"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:hint="@string/actfm_TVA_tag_description_hint"
+            android:padding="8dip"
+            android:paddingBottom="12dip" />
+
+        <!-- Footer -->
+
+        <TextView
+            android:id="@+id/settings_label"
+            style="@style/TextAppearance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
+            android:text="@string/actfm_TVA_tag_settings_label" />
 
-            <EditText
-                android:id="@+id/tag_description"
-                style="@style/EditRow"
+        <LinearLayout
+            style="@style/EditRow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:orientation="vertical" >
+
+            <RelativeLayout
+                android:id="@+id/tag_silenced_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:hint="@string/actfm_TVA_tag_description_hint"
-                android:padding="8dip"
-                android:paddingBottom="12dip" />
+                android:orientation="horizontal" >
 
-            <!-- Footer -->
+                <TextView
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginTop="10dip"
+                    android:padding="5dip"
+                    android:text="@string/actfm_TVA_silence_label" />
 
-            <TextView
-                android:id="@+id/settings_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:layout_marginTop="10dip"
-                android:text="@string/actfm_TVA_tag_settings_label" />
+                <ToggleButton
+                    android:id="@+id/tag_silenced"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:paddingRight="5dip" />
+            </RelativeLayout>
 
-            <LinearLayout
-                style="@style/EditRow"
-                android:layout_width="wrap_content"
+            <View
+                android:id="@+id/divider"
+                style="@style/TEA_Separator"
+                android:layout_width="fill_parent"
+                android:layout_height="1dip" />
+
+            <RelativeLayout
+                android:id="@+id/create_shortcut_container"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:orientation="vertical" >
+                android:orientation="horizontal"
+                android:padding="5dip" >
 
-                <RelativeLayout
-                    android:id="@+id/tag_silenced_container"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="5dip" >
-
-                    <TextView
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginTop="10dip"
-                        android:text="@string/actfm_TVA_silence_label" />
-
-                    <ToggleButton
-                        android:id="@+id/tag_silenced"
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="35dip"
-                        android:background="#00000000"
-                        android:layout_alignParentRight="true" />
-                </RelativeLayout>
-
-                <View
-                    android:id="@+id/divider"
-                    style="@style/TEA_Separator"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dip" />
-
-                <RelativeLayout
-                    android:id="@+id/create_shortcut_container"
-                    android:layout_width="fill_parent"
+                <TextView
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="5dip" >
-
-                    <TextView
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginTop="10dip"
-                        android:text="@string/FLA_shortcut_dialog_title" />
-
-                    <ImageButton
-                        android:id="@+id/create_shortcut"
-                        android:layout_width="40dip"
-                        android:layout_height="40dip"
-                        android:layout_alignParentRight="true"
-                        android:background="@android:color/transparent"
-                        android:scaleType="fitCenter"
-                        android:src="@android:drawable/ic_media_ff" />
-                </RelativeLayout>
-            </LinearLayout>
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginTop="10dip"
+                    android:text="@string/FLA_shortcut_dialog_title" />
+
+                <ImageButton
+                    android:id="@+id/create_shortcut"
+                    android:layout_width="40dip"
+                    android:layout_height="40dip"
+                    android:layout_alignParentRight="true"
+                    android:background="@android:color/transparent"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/icn_list_shortcut" />
+            </RelativeLayout>
         </LinearLayout>
-    </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/leave_list"
+            style="@style/DeleteTag"
+            android:layout_width="fill_parent"
+            android:layout_height="40dip"
+            android:layout_marginTop="10dip"
+            android:padding="5dip"
+            android:text="@string/tag_delete_button" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index b723980c8..3a82a01b3 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -102,9 +102,15 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">List Settings</string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
+  
+  <!-- Delete button for tag settings -->
+  <string name="tag_delete_button">Delete List</string>
+  
+  <!-- Leave button for tag settings -->
+  <string name="tag_leave_button">Leave This List</string>
 
 </resources>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 49daeb5b5..93a344d73 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -156,6 +156,11 @@
         <item name="android:windowTitleStyle">@style/DialogTitle</item>
         <item name="android:windowTitleBackgroundStyle">@style/DialogTitle</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
+        
+        
+        <item name="asEditBackground">#101010</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background</item>
+        <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
     
     <style name="Theme.Dialog.White">
@@ -171,6 +176,10 @@
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
+        
+        <item name="asEditBackground">#dddddd</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
+        <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
         
     <!--================================================== General == -->
@@ -375,6 +384,13 @@
         <item name="android:textColor">?attr/asFilterHeaderColor</item>
     </style>
 
+    <!-- ========================================================= Tag Settings == -->
+    
+    <style name="DeleteTag" >
+        <item name="android:textColor">?attr/asTextColor</item>
+        <item name="android:background">?attr/asThemeTextColor</item>
+    </style>
+    
     <!-- ========================================================= Widget == -->
 
     <style name="TextAppearance.Widget">                                                                                                                                                                                      
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 9627ec238..ef19a3839 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -113,33 +113,33 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     };
 
     /**
-	 * @see android.app.Activity#onCreate(Bundle)
-	 */
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-	    ThemeService.applyTheme(this);
-		super.onCreate(savedInstanceState);
-
-		if (shouldUseThreePane(this))
-		    setContentView(R.layout.task_list_wrapper_activity_3pane);
-		else
-		    setContentView(R.layout.task_list_wrapper_activity);
-
-		ActionBar actionBar = getSupportActionBar();
-		actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-		actionBar.setCustomView(R.layout.header_nav_views);
-
-		listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav);
-		listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
-		lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
-		mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
-		commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
-
-		initializeFragments(actionBar);
-		createMainMenuPopover();
-		mainMenu.setOnClickListener(mainMenuClickListener);
-		commentsButton.setOnClickListener(commentsButtonClickListener);
+     * @see android.app.Activity#onCreate(Bundle)
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        ThemeService.applyTheme(this);
+        super.onCreate(savedInstanceState);
+
+        if (shouldUseThreePane(this))
+            setContentView(R.layout.task_list_wrapper_activity_3pane);
+        else
+            setContentView(R.layout.task_list_wrapper_activity);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        actionBar.setCustomView(R.layout.header_nav_views);
+
+        listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav);
+        listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
+        lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
+        mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
+        commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
+
+        initializeFragments(actionBar);
+        createMainMenuPopover();
+        mainMenu.setOnClickListener(mainMenuClickListener);
+        commentsButton.setOnClickListener(commentsButtonClickListener);
 
         Filter savedFilter = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
 
@@ -151,50 +151,50 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
         if (savedFilter != null)
             setListsTitle(savedFilter.title);
-	}
+    }
 
-	/**
-	 *
-	 * @param actionBar
-	 */
+    /**
+     *
+     * @param actionBar
+     */
     protected void initializeFragments(ActionBar actionBar) {
         View filterFragment = findViewById(R.id.filterlist_fragment_container);
         View editFragment = findViewById(R.id.taskedit_fragment_container);
 
-		if (filterFragment != null) {
-		    actionBar.setDisplayHomeAsUpEnabled(false);
-		    actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE);
-		    listsNav.setOnClickListener(null);
-
-		    if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
-		        fragmentLayout = LAYOUT_TRIPLE;
-		        actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE);
-		    } else {
-		        fragmentLayout = LAYOUT_DOUBLE;
-		        createEditPopover();
-		        createCommentsPopover();
-		    }
-
-		    setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
-		            R.id.filterlist_fragment_container, FilterListFragment.class);
-		} else {
-		    fragmentLayout = LAYOUT_SINGLE;
-		    actionBar.setDisplayHomeAsUpEnabled(true);
-		    listsNav.setOnClickListener(popupMenuClickListener);
-		    createListsPopover();
-		    setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class));
-		}
+        if (filterFragment != null) {
+            actionBar.setDisplayHomeAsUpEnabled(false);
+            actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE);
+            listsNav.setOnClickListener(null);
+
+            if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
+                fragmentLayout = LAYOUT_TRIPLE;
+                actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE);
+            } else {
+                fragmentLayout = LAYOUT_DOUBLE;
+                createEditPopover();
+                createCommentsPopover();
+            }
+
+            setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
+                    R.id.filterlist_fragment_container, FilterListFragment.class);
+        } else {
+            fragmentLayout = LAYOUT_SINGLE;
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            listsNav.setOnClickListener(popupMenuClickListener);
+            createListsPopover();
+            setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, FilterListFragment.class));
+        }
     }
 
     private void createListsPopover() {
-	    listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
+        listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
         listsPopover.setOnDismissListener(new OnDismissListener() {
             @Override
             public void onDismiss() {
                 setListsDropdownSelected(false);
             }
         });
-	}
+    }
 
     private void createEditPopover() {
         editPopover = new FragmentPopover(this, R.layout.taskedit_popover);
@@ -250,40 +250,40 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         }
     }
 
-	public void setupPopoverWithFilterList(FilterListFragment fla) {
-	    setupPopoverWithFragment(listsPopover, fla, null);
-	}
+    public void setupPopoverWithFilterList(FilterListFragment fla) {
+        setupPopoverWithFragment(listsPopover, fla, null);
+    }
 
-	@Override
+    @Override
     public void onTaskListItemClicked(long taskId) {
-	    super.onTaskListItemClicked(taskId);
-	    if (fragmentLayout == LAYOUT_DOUBLE && getTaskEditFragment() != null) {
-	        DisplayMetrics metrics = getResources().getDisplayMetrics();
-	        setupPopoverWithFragment(editPopover, getTaskEditFragment(), new LayoutParams((int) (400 * metrics.density), (int) (600 * metrics.density)));
-	        editPopover.show(listsNav);
-	    }
-	}
-
-
-	@Override
-	public boolean onFilterItemClicked(FilterListItem item) {
-	    if (listsPopover != null)
-	        listsPopover.dismiss();
-	    setCommentsCount(0);
-	    return super.onFilterItemClicked(item);
-	}
-
-	private void setListsDropdownSelected(boolean selected) {
-	    int oldTextColor = lists.getTextColors().getDefaultColor();
-	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
-	        R.style.TextAppearance_ActionBar_ListsHeader);
-
-	    TypedValue listDisclosure = new TypedValue();
-	    getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);
-	    lists.setTextAppearance(this, textStyle);
-	    listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
-	    listsNavDisclosure.setSelected(selected);
-	}
+        super.onTaskListItemClicked(taskId);
+        if (fragmentLayout == LAYOUT_DOUBLE && getTaskEditFragment() != null) {
+            DisplayMetrics metrics = getResources().getDisplayMetrics();
+            setupPopoverWithFragment(editPopover, getTaskEditFragment(), new LayoutParams((int) (400 * metrics.density), (int) (600 * metrics.density)));
+            editPopover.show(listsNav);
+        }
+    }
+
+
+    @Override
+    public boolean onFilterItemClicked(FilterListItem item) {
+        if (listsPopover != null)
+            listsPopover.dismiss();
+        setCommentsCount(0);
+        return super.onFilterItemClicked(item);
+    }
+
+    private void setListsDropdownSelected(boolean selected) {
+        int oldTextColor = lists.getTextColors().getDefaultColor();
+        int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
+            R.style.TextAppearance_ActionBar_ListsHeader);
+
+        TypedValue listDisclosure = new TypedValue();
+        getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);
+        lists.setTextAppearance(this, textStyle);
+        listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
+        listsNavDisclosure.setSelected(selected);
+    }
 
     @Override
     protected void onPostResume() {
@@ -330,7 +330,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     }
 
     public void setSelectedItem(Filter item) {
-       lists.setText(item.title);
+        lists.setText(item.title);
     }
 
     public void setCommentsCount(int count) {
@@ -352,7 +352,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     @Override
     public void onBackPressed() {
-     // manage task edit visibility
+        // manage task edit visibility
         View taskeditFragmentContainer = findViewById(R.id.taskedit_fragment_container);
         if(taskeditFragmentContainer != null && taskeditFragmentContainer.getVisibility() == View.VISIBLE) {
             if(fragmentLayout == LAYOUT_DOUBLE) {
@@ -488,7 +488,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             String deletedTag = intent.getStringExtra(TagViewFragment.EXTRA_TAG_NAME);
             String deletedTagSql = intent.getStringExtra(TagFilterExposer.TAG_SQL);
             FilterListFragment fl = getFilterListFragment();
-            if (fl != null) {
+            if (deletedTagSql.equals(TagFilterExposer.SHOW_ACTIVE_TASKS)) {
+                fl.switchToActiveTasks();
+                fl.clear(); // Should auto refresh
+            }
+            else if (fl != null) {
                 Filter currentlyShowing = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER);
                 if (currentlyShowing != null) {
                     boolean titlesMatch = currentlyShowing.title != null && currentlyShowing.title.equals(deletedTag);
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index 8dde76499..cb3a034c8 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -56,10 +56,10 @@ public class UpdateAdapter extends CursorAdapter {
     private static final String UPDATE_FRIENDS = "friends";  //$NON-NLS-1$
     private static final String UPDATE_REQUEST_FRIENDSHIP = "request_friendship"; //$NON-NLS-1$
     private static final String UPDATE_CONFIRMED_FRIENDSHIP = "confirmed_friendship"; //$NON-NLS-1$
-    private static final String UPDATE_TASK_CREATED = "task_created";
-    private static final String UPDATE_TASK_COMPLETED = "task_completed";
-    private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted";
-    private static final String UPDATE_TASK_TAGGED = "task_tagged";
+    private static final String UPDATE_TASK_CREATED = "task_created"; //$NON-NLS-1$
+    private static final String UPDATE_TASK_COMPLETED = "task_completed"; //$NON-NLS-1$
+    private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted"; //$NON-NLS-1$
+    private static final String UPDATE_TASK_TAGGED = "task_tagged"; //$NON-NLS-1$
     private static final String UPDATE_TASK_ASSIGNED = "task_assigned";
     private static final String UPDATE_TASK_COMMENT = "task_comment";
     private static final String UPDATE_TAG_COMMENT = "tag_comment";
@@ -270,7 +270,6 @@ public class UpdateAdapter extends CursorAdapter {
         else if (actionCode.equals(UPDATE_TAG_COMMENT)) {
             if (fromView.equals(FROM_TAG_VIEW))
                 commentResource = R.string.update_string_default_comment;
-
             else
                 commentResource = R.string.update_string_tag_comment;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
index 48ce6e69a..a21e35b8b 100644
--- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
+++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
@@ -86,6 +86,12 @@ public class PeopleContainer extends LinearLayout {
         final AsyncImageView imageView = (AsyncImageView)tagItem.
             findViewById(R.id.icon);
         imageView.setUrl(image);
+        if (TextUtils.isEmpty(textView.getText())) {
+            imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+        }
+        else {
+            imageView.setDefaultImageResource(R.drawable.icn_add_contact);
+        }
 
         textView.addTextChangedListener(new TextWatcher() {
             @Override
@@ -102,6 +108,10 @@ public class PeopleContainer extends LinearLayout {
                     int count) {
                 if(count > 0 && getLastTextView() == textView) {
                     addPerson("", ""); //$NON-NLS-1$
+                    imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+                }
+                else {
+                    imageView.setDefaultImageResource(R.drawable.icn_add_contact);
                 }
 
                 if(onAddNewPerson != null)

From 2a01d8460d6e01a70ab5b10a0478a85b6bcd568e Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Wed, 22 Feb 2012 15:27:43 -0800
Subject: [PATCH 4/5] Caching images in AsyncImageView

---
 api/src/com/todoroo/astrid/data/TagData.java  |   4 -
 api/src/com/todoroo/astrid/data/Update.java   |   4 -
 .../astrid/actfm/EditPeopleControlSet.java    |   3 +-
 .../astrid/actfm/TagSettingsActivity.java     |  91 +++--
 .../astrid/actfm/TagUpdatesFragment.java      |   2 +-
 .../todoroo/astrid/actfm/TagViewFragment.java |   2 +-
 .../astrid/actfm/sync/ActFmInvoker.java       |   6 +-
 .../astrid/notes/EditNoteActivity.java        |  17 +-
 astrid/res/drawable/icn_add_contact.png       | Bin 282 -> 508 bytes
 astrid/res/drawable/icn_list_shortcut.png     | Bin 8678 -> 5921 bytes
 astrid/res/layout/assigned_adapter_row.xml    |   2 +-
 astrid/res/layout/contact_adapter_row.xml     |   2 +-
 astrid/res/layout/contact_edit_row.xml        |  10 +-
 astrid/res/layout/filter_adapter_row.xml      |   2 +-
 astrid/res/layout/tag_settings_activity.xml   | 347 ++++++++++--------
 astrid/res/layout/tag_updates_fragment.xml    |   2 +-
 astrid/res/layout/tag_updates_header.xml      |   2 +-
 .../res/layout/task_adapter_draggable_row.xml | 127 +++++++
 astrid/res/layout/task_adapter_row.xml        |   5 +-
 astrid/res/layout/update_adapter_row.xml      |   6 +-
 astrid/res/layout/web_service_amazon_row.xml  |   2 +-
 astrid/res/layout/web_service_row.xml         |   2 +-
 astrid/res/values/strings-actfm.xml           |   3 +
 astrid/res/values/styles.xml                  |   5 +-
 .../astrid/activity/FilterListFragment.java   |  29 +-
 .../todoroo/astrid/adapter/FilterAdapter.java |   2 +-
 .../todoroo/astrid/adapter/TaskAdapter.java   |   2 +-
 .../todoroo/astrid/adapter/UpdateAdapter.java |   2 +-
 .../todoroo/astrid/helper/AsyncImageView.java |  67 ++++
 .../todoroo/astrid/helper/ImageDiskCache.java | 250 +++++++------
 .../todoroo/astrid/ui/PeopleContainer.java    |  50 +--
 .../todoroo/astrid/ui/WebServicesView.java    |   2 +-
 32 files changed, 649 insertions(+), 401 deletions(-)
 create mode 100644 astrid/res/layout/task_adapter_draggable_row.xml
 create mode 100644 astrid/src/com/todoroo/astrid/helper/AsyncImageView.java

diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java
index be2e379b5..9ce7b5de6 100644
--- a/api/src/com/todoroo/astrid/data/TagData.java
+++ b/api/src/com/todoroo/astrid/data/TagData.java
@@ -203,8 +203,4 @@ public final class TagData extends RemoteModel {
             return getValue(DELETION_DATE) > 0;
     }
 
-    public String getPictureHash() {
-       return getId() + "" + getValue(TagData.CREATION_DATE);
-    }
-
 }
diff --git a/api/src/com/todoroo/astrid/data/Update.java b/api/src/com/todoroo/astrid/data/Update.java
index b0206d8a6..64fc5ca17 100644
--- a/api/src/com/todoroo/astrid/data/Update.java
+++ b/api/src/com/todoroo/astrid/data/Update.java
@@ -162,8 +162,4 @@ public class Update extends RemoteModel {
         return CREATOR;
     }
 
-    public String getPictureHash() {
-        String s = getValue(Update.TASK) + "" + getValue(Update.CREATION_DATE);
-        return s;
-    }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 71f730b82..ef8b122fc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.actfm;
 
-import greendroid.widget.AsyncImageView;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -50,6 +48,7 @@ import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TagDataService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 9ce64110b..8ae09c388 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.actfm;
 
-import greendroid.widget.AsyncImageView;
-
 import java.io.IOException;
 
 import org.json.JSONArray;
@@ -24,10 +22,11 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.ToggleButton;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
@@ -46,6 +45,7 @@ import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.TagData;
+import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.helper.ImageDiskCache;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
@@ -84,7 +84,7 @@ public class TagSettingsActivity extends FragmentActivity {
     private AsyncImageView picture;
     private EditText tagName;
     private EditText tagDescription;
-    private ToggleButton isSilent;
+    private CheckBox isSilent;
     private Bitmap setBitmap;
     private final ImageDiskCache imageCache;
 
@@ -173,7 +173,7 @@ public class TagSettingsActivity extends FragmentActivity {
         tagName = (EditText) findViewById(R.id.tag_name);
         tagDescription = (EditText) findViewById(R.id.tag_description);
         picture = (AsyncImageView) findViewById(R.id.picture);
-        isSilent = (ToggleButton) findViewById(R.id.tag_silenced);
+        isSilent = (CheckBox) findViewById(R.id.tag_silenced);
         isSilent.setChecked(tagData.getFlag(TagData.FLAGS, TagData.FLAG_SILENT));
 
         Button leaveListButton = (Button) findViewById(R.id.leave_list);
@@ -205,12 +205,13 @@ public class TagSettingsActivity extends FragmentActivity {
         if (isNewTag) {
             findViewById(R.id.create_shortcut_container).setVisibility(View.GONE);
         } else {
-            findViewById(R.id.create_shortcut).setOnClickListener(new OnClickListener() {
+            findViewById(R.id.create_shortcut_container).setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     if (filter == null) {
                         filter = TagFilterExposer.filterFromTagData(TagSettingsActivity.this, tagData);
                     }
+                    filter.listingIcon = picture.getImageBitmap();
                     FilterListFragment.showCreateShortcutDialog(TagSettingsActivity.this, ShortcutActivity.createIntent(filter), filter);
                 }
             });
@@ -334,8 +335,7 @@ public class TagSettingsActivity extends FragmentActivity {
                     public void run() {
                         actFmSyncService.pushTagDataOnSave(tagData, tagData.getMergedValues());
                         if(setBitmap != null && tagData.getValue(TagData.REMOTE_ID) > 0)
-                                uploadTagPicture(setBitmap);
-
+                            uploadTagPicture(setBitmap);
 
                         runOnUiThread(loadTag);
                     }
@@ -357,7 +357,7 @@ public class TagSettingsActivity extends FragmentActivity {
     private void saveTagPictureLocally(Bitmap bitmap) {
         if (bitmap == null) return;
         try {
-            String tagPicture = tagData.getPictureHash();
+            String tagPicture = ImageDiskCache.getPictureHash(tagData);
             imageCache.put(tagPicture, bitmap);
             tagData.setValue(TagData.PICTURE, tagPicture);
         }
@@ -397,18 +397,11 @@ public class TagSettingsActivity extends FragmentActivity {
                 setTitle(getString(R.string.tag_settings_title));
             }
         }
-        String tagImage = tagData.getValue(TagData.PICTURE);
-        if(!TextUtils.isEmpty(tagImage) && imageCache.contains(tagImage)) {
-            try {
-                picture.setDefaultImageBitmap(imageCache.get(tagImage));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        else {
-            picture.setUrl(tagImage);
-        }
         picture.setUrl(tagData.getValue(TagData.PICTURE));
+        if (!isNewTag) {
+            ImageView shortcut = (ImageView) findViewById(R.id.create_shortcut);
+            shortcut.setImageBitmap(FilterListFragment.superImposeListIcon(this, picture.getImageBitmap(), tagData.getValue(TagData.NAME)));
+        }
 
         String peopleJson = tagData.getValue(TagData.MEMBERS);
         updateMembers(peopleJson);
@@ -438,6 +431,10 @@ public class TagSettingsActivity extends FragmentActivity {
             public void run() {
                 try {
                     String url = actFmSyncService.setTagPicture(tagData.getValue(TagData.REMOTE_ID), bitmap);
+                    if (TextUtils.isEmpty(url)) return;
+                    if (imageCache.contains(tagData.getValue(TagData.PICTURE))) {
+                        imageCache.move(tagData.getValue(TagData.PICTURE), url);
+                    }
                     tagData.setValue(TagData.PICTURE, url);
                     Flags.set(Flags.ACTFM_SUPPRESS_SYNC);
                     tagDataService.save(tagData);
@@ -510,39 +507,37 @@ public class TagSettingsActivity extends FragmentActivity {
 
 
 
-        protected void showDeleteDialog(TagData tagData) {
-            int string;
-            if (tagData != null && tagData.getValue(TagData.MEMBER_COUNT) > 0)
-                string = R.string.DLG_leave_this_shared_tag_question;
-            else
-                string = R.string.DLG_delete_this_tag_question;
-            DialogUtilities.okCancelDialog(this, getString(string, tagData.getValue(TagData.NAME)), new DialogInterface.OnClickListener() {
-
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    deleteTag();
-                }
-            }, null );
-        }
+    protected void showDeleteDialog(TagData tagData) {
+        int string;
+        if (tagData != null && tagData.getValue(TagData.MEMBER_COUNT) > 0)
+            string = R.string.DLG_leave_this_shared_tag_question;
+        else
+            string = R.string.DLG_delete_this_tag_question;
+        DialogUtilities.okCancelDialog(this, getString(string, tagData.getValue(TagData.NAME)), new DialogInterface.OnClickListener() {
 
-        protected boolean deleteTag() {
-            tagDataService.delete(tagData.getId());
-            boolean shared = false;
-            if(tagData != null) {
-                tagData.setValue(TagData.DELETION_DATE, DateUtilities.now());
-                PluginServices.getTagDataService().save(tagData);
-                shared = tagData.getValue(TagData.MEMBER_COUNT) > 0 && tagData.getValue(TagData.USER_ID) != 0; // Was I a list member and NOT owner?
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                deleteTag();
             }
+        }, null );
+    }
 
-            Intent tagDeleted = new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED);
-            tagDeleted.putExtra(TagViewFragment.EXTRA_TAG_NAME, tagData.getValue(TagData.NAME));
-            tagDeleted.putExtra(TagFilterExposer.TAG_SQL, TagFilterExposer.SHOW_ACTIVE_TASKS);
+    protected boolean deleteTag() {
+        tagDataService.delete(tagData.getId());
+        if(tagData != null) {
+            tagData.setValue(TagData.DELETION_DATE, DateUtilities.now());
+            PluginServices.getTagDataService().save(tagData);
+        }
 
-            this.finish();
-            sendBroadcast(tagDeleted);
+        Intent tagDeleted = new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED);
+        tagDeleted.putExtra(TagViewFragment.EXTRA_TAG_NAME, tagData.getValue(TagData.NAME));
+        tagDeleted.putExtra(TagFilterExposer.TAG_SQL, TagFilterExposer.SHOW_ACTIVE_TASKS);
 
-            return true;
-        }
+        this.finish();
+        sendBroadcast(tagDeleted);
+
+        return true;
+    }
 
 
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
index 2373f5131..007f7bc02 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
@@ -1,6 +1,6 @@
 package com.todoroo.astrid.actfm;
 
-import greendroid.widget.AsyncImageView;
+import com.todoroo.astrid.helper.AsyncImageView;
 import android.app.Activity;
 import android.content.Intent;
 import android.database.Cursor;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index e563189dc..e4ff1407a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -1,6 +1,6 @@
 package com.todoroo.astrid.actfm;
 
-import greendroid.widget.AsyncImageView;
+import com.todoroo.astrid.helper.AsyncImageView;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
index 30ba3aef8..464c30965 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -26,9 +26,9 @@ import com.todoroo.andlib.utility.Preferences;
 public class ActFmInvoker {
 
     /** NOTE: these values are development values & will not work on production */
-    private static final String URL = "//astrid.com/api/";
-    private static final String APP_ID = "bf6170638298af8ed9a8c79995b1fc0f";
-    private static final String APP_SECRET = "d15d25c63323bddcaa48928dccac1207";
+    private static final String URL = "//10.0.2.2:3000/api/";
+    private static final String APP_ID = "a4732a32859dbcd3e684331acd36432c";
+    private static final String APP_SECRET = "e389bfc82a0d932332f9a8bd8203735f";
 
     public static final String PROVIDER_FACEBOOK = "facebook";
     public static final String PROVIDER_GOOGLE= "google";
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 55a44575d..eb090f7f0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.notes;
 
-import greendroid.widget.AsyncImageView;
-
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -58,6 +55,7 @@ import com.todoroo.astrid.dao.UpdateDao;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.Update;
+import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.helper.ImageDiskCache;
 import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
 import com.todoroo.astrid.service.MetadataService;
@@ -367,16 +365,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 commentPictureView.setVisibility(View.GONE);
             else {
                 commentPictureView.setVisibility(View.VISIBLE);
-                if(imageCache.contains(item.commentPicture)) {
-                    try {
-                        commentPictureView.setDefaultImageBitmap(imageCache.get(item.commentPicture));
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-                else {
-                    commentPictureView.setUrl(item.commentPicture);
-                }
+                commentPictureView.setUrl(item.commentPicture);
             }
         }
     }
@@ -445,7 +434,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         if (usePicture && pendingCommentPicture != null) {
             update.setValue(Update.PICTURE, Update.PICTURE_LOADING);
             try {
-                String updateString = update.getPictureHash();
+                String updateString = ImageDiskCache.getPictureHash(update);
                 imageCache.put(updateString, pendingCommentPicture);
                 update.setValue(Update.PICTURE, updateString);
             }
diff --git a/astrid/res/drawable/icn_add_contact.png b/astrid/res/drawable/icn_add_contact.png
index cdbb282f2e76173a6b6c549b06b9c53ee748268c..a45edcc191e42fa701f8b949c344fc91a663b012 100644
GIT binary patch
delta 453
zcmV;$0XqJg0{jCZiBL{Q4GJ0x0000DNk~Le0000m0000g2nGNE0QFDUdXXVRe*uC?
zL_t(o!|j>Tae_b)hQHjT07{?(DS^!J9!j7C>A-a0qym!)AQfl_Y6aK<l;8tL;y7_4
zcgr14?tkKeJ@#Y&^|<vZ%Q6HN14|&+*Oxj0HSn&lMWh6iFMtLpe@T9TEA>6a+yDw-
zGvfY@6oeA8&DtPteWOy&0aid{e-IbxSg!z)r4<T8crk!fpn|DSfJ6Ww@d>aH09g3$
z0er3@xsiEM00;n{0S*E=9DD*C1ptmd0d@iaJD&h2OA8!q4>uA`{OKuH4B!Lk4B|Q+
z>m8ueXWg-?4Z$bb2fiG|Oa@RpiU~V$0GJ~{L_e?^t5V`XWCIY>&vqKjf9FC&Z0r&s
z1uA~Vh><|`8og#ZB|rh}fi3;;R$94Ud(Vhjle*I;E&V(*anP5EepY*rz0@CXqmgPh
zOMBg{y1EK@)8s~eoKQpGwK~V|7y5jW{MM00Y^$;YUV#^&8!AveK=RjpQVkYLXJ(f%
vwn`QKe_D^KrJCqB-Ien28!;CE{yV@KBWFe|5KTt=00000NkvXXu0mjf$@#Xg

delta 225
zcmV<703QGR1DXOMiBL{Q4GJ0x0000DNk~Le0000O0000L2nGNE09@%VCXpdSe*mCK
zL_t(I%jJ|o4Zt7_MJoXbNa270BuokpkTMCAf&?TmSh{2(0XjO8Ejzpmq5lzR0j)I<
zu!)d}NWisjEj2t=uv~#CPF@ml&#*u>!cP=OU<m^IZ-F5Q47ZDV0>PbwwGqBPF=%G=
zdZ+?u2;lVsMR<eTlbpL^Nq9mBH=TH_5iNmCxX$O+BVdNS3bJ)$gx1KJ0?-&I;b3C;
b!S@9_e|U{&RG*Zo00000NkvXXu0mjf$8S)N

diff --git a/astrid/res/drawable/icn_list_shortcut.png b/astrid/res/drawable/icn_list_shortcut.png
index 3ba4786ce0280f6432b8338bb7b641364721773f..fd37e8bbdf8e004501581ccdf5ce9092de6c3b53 100644
GIT binary patch
delta 5640
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

literal 8678
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
Q|L28)uBp!bGtQC!4^BIhXaE2J

diff --git a/astrid/res/layout/assigned_adapter_row.xml b/astrid/res/layout/assigned_adapter_row.xml
index 13c078d91..95dbffd16 100644
--- a/astrid/res/layout/assigned_adapter_row.xml
+++ b/astrid/res/layout/assigned_adapter_row.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:paddingLeft="8dip">
 
-    <greendroid.widget.AsyncImageView android:id="@+id/person_image"
+    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/person_image"
         android:layout_width="40dip"
         android:layout_height="44dip"
         android:gravity="center"
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index 973413fce..7ce0a174c 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -10,7 +10,7 @@
     android:orientation="horizontal">
         
     <!-- picture thumbnail -->
-    <greendroid.widget.AsyncImageView android:id="@+id/icon"
+    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/icon"
         android:layout_width="40dip"
         android:layout_height="44dip"
         android:gravity="center"
diff --git a/astrid/res/layout/contact_edit_row.xml b/astrid/res/layout/contact_edit_row.xml
index 2fa069eb9..24a33eae3 100644
--- a/astrid/res/layout/contact_edit_row.xml
+++ b/astrid/res/layout/contact_edit_row.xml
@@ -25,13 +25,13 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
 
-        <greendroid.widget.AsyncImageView
+        <com.todoroo.astrid.helper.AsyncImageView
             android:id="@+id/icon"
             android:layout_width="31dip"
             android:layout_height="35dip"
+            android:layout_margin="5dip"
             astrid:defaultSrc="@drawable/icn_default_person_image"
             android:gravity="center"
-            android:layout_margin="5dip"
             android:scaleType="fitCenter" />
 
         <com.todoroo.astrid.ui.ContactsAutoComplete
@@ -39,11 +39,13 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_weight="1"
             android:layout_marginLeft="5dip"
+            android:layout_weight="1"
             android:background="#00000000"
             android:hint="@string/actfm_person_hint"
-            android:textColor="@android:color/black" />
+                    style="@style/TextAppearance"
+            android:textCursorDrawable="@null"
+            android:textSize="15sp" />
 
         <ImageButton
             android:id="@+id/button1"
diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
index a9b38d8c5..b80eb378e 100644
--- a/astrid/res/layout/filter_adapter_row.xml
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -21,7 +21,7 @@
         android:visibility="gone"/>
         
     <!-- filter url image icon -->
-    <greendroid.widget.AsyncImageView android:id="@+id/url_image"
+    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/url_image"
         android:layout_width="30dip"
         android:layout_height="48dip"
         android:layout_alignParentLeft="true"
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 76bf02035..0b14fc394 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -1,202 +1,229 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:id="@+id/settings"
-    style="@style/Content_EditScroll"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_weight="100" >
 
-    <LinearLayout
+    <ScrollView
+        android:id="@+id/settings"
+        style="@style/Content_EditScroll"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="5dip"
+        android:layout_height="fill_parent"
+        android:layout_weight="100"
+        android:padding="10dip"
         android:paddingTop="0dip" >
 
         <LinearLayout
-            android:id="@+id/save_and_cancel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:gravity="right"
-            android:orientation="horizontal"
-            android:visibility="gone" >
+            android:orientation="vertical" >
 
-            <ImageButton
-                android:id="@+id/cancel"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/save_and_cancel"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dip"
-                android:background="@android:color/transparent"
-                android:src="@android:drawable/ic_menu_close_clear_cancel" />
+                android:gravity="right"
+                android:orientation="horizontal"
+                android:visibility="gone" >
 
-            <ImageButton
-                android:id="@+id/save"
-                android:layout_width="wrap_content"
+                <ImageButton
+                    android:id="@+id/cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dip"
+                    android:background="@android:color/transparent"
+                    android:src="@android:drawable/ic_menu_close_clear_cancel" />
+
+                <ImageButton
+                    android:id="@+id/save"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dip"
+                    android:background="@android:color/transparent"
+                    android:src="@android:drawable/ic_menu_save" />
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dip"
-                android:background="@android:color/transparent"
-                android:src="@android:drawable/ic_menu_save" />
-        </LinearLayout>
+                android:paddingBottom="5dip"
+                android:paddingTop="5dip" >
 
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="5dip"
-            android:paddingTop="5dip" >
+                <!-- picture -->
 
-            <!-- picture -->
+                <com.todoroo.astrid.helper.AsyncImageView
+                    android:id="@+id/picture"
+                    android:layout_width="80dip"
+                    android:layout_height="80dip"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    astrid:defaultSrc="@android:drawable/ic_menu_gallery"
+                    android:scaleType="centerCrop" />
 
-            <greendroid.widget.AsyncImageView
-                android:id="@+id/picture"
-                android:layout_width="80dip"
-                android:layout_height="80dip"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                astrid:defaultSrc="@android:drawable/ic_menu_gallery"
-                android:paddingRight="10dip"
-                android:scaleType="centerInside" />
+                <TextView
+                    android:id="@+id/tag_label"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginLeft="10dip"
+                    android:layout_toRightOf="@id/picture"
+                    android:text="@string/actfm_TVA_tag_label" />
+
+                <LinearLayout
+                    style="@style/EditRow"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tag_label"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginTop="14dip"
+                    android:layout_toRightOf="@id/picture"
+                    android:padding="10dip"
+                    android:paddingBottom="14dip" >
+
+                    <EditText
+                        android:id="@+id/tag_name"
+                        style="@style/TextAppearance"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:background="#00000000"
+                        android:hint="@string/actfm_TVA_tag_description_hint"
+                        android:singleLine="true"
+                        android:textCursorDrawable="@null"
+                        android:textSize="15sp" />
+                </LinearLayout>
+            </RelativeLayout>
 
             <TextView
-                android:id="@+id/tag_label"
                 style="@style/TextAppearance"
-                android:layout_width="wrap_content"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_marginTop="2dip"
-                android:layout_toRightOf="@id/picture"
-                android:text="@string/actfm_TVA_tag_label" />
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="10dip"
+                android:paddingBottom="5dip"
+                android:text="@string/actfm_TVA_members_label" />
 
-            <EditText
-                android:id="@+id/tag_name"
+            <com.todoroo.astrid.ui.PeopleContainer
+                android:id="@+id/members_container"
                 style="@style/EditRow"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/tag_label"
-                android:layout_marginTop="10dip"
-                android:layout_toRightOf="@id/picture"
-                android:maxLines="1"
-                android:padding="10dip"
-                android:paddingBottom="14dip" />
-        </RelativeLayout>
-
-        <TextView
-            style="@style/TextAppearance"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dip"
-            android:layout_marginTop="10dip"
-            android:paddingBottom="5dip"
-            android:text="@string/actfm_TVA_members_label" />
-
-        <com.todoroo.astrid.ui.PeopleContainer
-            android:id="@+id/members_container"
-            style="@style/EditRow"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-
-        <TextView
-            android:id="@+id/description_label"
-            style="@style/TextAppearance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dip"
-            android:layout_marginTop="10dip"
-            android:text="@string/actfm_TVA_tag_description_label" />
-
-        <EditText
-            android:id="@+id/tag_description"
-            style="@style/EditRow"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:hint="@string/actfm_TVA_tag_description_hint"
-            android:padding="8dip"
-            android:paddingBottom="12dip" />
-
-        <!-- Footer -->
+                android:orientation="vertical" />
 
-        <TextView
-            android:id="@+id/settings_label"
-            style="@style/TextAppearance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dip"
-            android:layout_marginTop="10dip"
-            android:text="@string/actfm_TVA_tag_settings_label" />
-
-        <LinearLayout
-            style="@style/EditRow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:orientation="vertical" >
+            <TextView
+                android:id="@+id/description_label"
+                style="@style/TextAppearance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="10dip"
+                android:text="@string/actfm_TVA_tag_description_label" />
 
-            <RelativeLayout
-                android:id="@+id/tag_silenced_container"
+            <LinearLayout
+                style="@style/EditRow"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:layout_below="@id/tag_label"
+                android:layout_marginTop="5dip"
+                android:padding="10dip"
+                android:paddingBottom="14dip" >
 
-                <TextView
+                <EditText
+                    android:id="@+id/tag_description"
                     style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginTop="10dip"
-                    android:padding="5dip"
-                    android:text="@string/actfm_TVA_silence_label" />
+                    android:background="#00000000"
+                    android:hint="@string/actfm_TVA_tag_description_hint"
+                    android:textCursorDrawable="@null"
+                    android:textSize="15sp" />
+            </LinearLayout>
 
-                <ToggleButton
-                    android:id="@+id/tag_silenced"
-                    style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:paddingRight="5dip" />
-            </RelativeLayout>
+            <!-- Footer -->
 
-            <View
-                android:id="@+id/divider"
-                style="@style/TEA_Separator"
-                android:layout_width="fill_parent"
-                android:layout_height="1dip" />
+            <TextView
+                android:id="@+id/settings_label"
+                style="@style/TextAppearance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="10dip"
+                android:text="@string/actfm_TVA_tag_settings_label" />
 
-            <RelativeLayout
-                android:id="@+id/create_shortcut_container"
-                android:layout_width="fill_parent"
+            <LinearLayout
+                style="@style/EditRow"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="5dip" >
+                android:layout_marginTop="5dip"
+                android:orientation="vertical" >
 
-                <TextView
-                    style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
+                <RelativeLayout
+                    android:id="@+id/tag_silenced_container"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginTop="10dip"
-                    android:text="@string/FLA_shortcut_dialog_title" />
-
-                <ImageButton
-                    android:id="@+id/create_shortcut"
-                    android:layout_width="40dip"
-                    android:layout_height="40dip"
-                    android:layout_alignParentRight="true"
-                    android:background="@android:color/transparent"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/icn_list_shortcut" />
-            </RelativeLayout>
+                    android:orientation="horizontal"
+                    android:padding="5dip" >
+
+                    <TextView
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginTop="10dip"
+                        android:paddingLeft="5dip"
+                        android:text="@string/actfm_TVA_silence_label" />
+
+                    <CheckBox
+                        android:id="@+id/tag_silenced"
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:paddingRight="5dip" />
+                </RelativeLayout>
+
+                <View
+                    android:id="@+id/divider"
+                    style="@style/TEA_Separator"
+                    android:layout_width="fill_parent"
+                    android:layout_height="1dip" />
+
+                <RelativeLayout
+                    android:id="@+id/create_shortcut_container"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="5dip" >
+
+                    <TextView
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginTop="10dip"
+                        android:paddingLeft="5dip"
+                        android:text="@string/FLA_shortcut_dialog_title" />
+
+                    <ImageButton
+                        android:id="@+id/create_shortcut"
+                        android:layout_width="40dip"
+                        android:layout_height="40dip"
+                        android:layout_alignParentRight="true"
+                        android:background="@android:color/transparent"
+                        android:scaleType="fitCenter"
+                        android:src="@drawable/icn_list_shortcut" />
+                </RelativeLayout>
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/leave_list"
+                style="@style/DeleteTag"
+                android:layout_width="fill_parent"
+                android:layout_height="40dip"
+                android:layout_marginTop="15dip"
+                android:text="@string/tag_delete_button" />
         </LinearLayout>
+    </ScrollView>
 
-        <Button
-            android:id="@+id/leave_list"
-            style="@style/DeleteTag"
-            android:layout_width="fill_parent"
-            android:layout_height="40dip"
-            android:layout_marginTop="10dip"
-            android:padding="5dip"
-            android:text="@string/tag_delete_button" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index 9bcf7dfce..3edfb16d0 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -79,4 +79,4 @@
             android:scaleType="center" />
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/astrid/res/layout/tag_updates_header.xml b/astrid/res/layout/tag_updates_header.xml
index 0fc320b58..4f90509b9 100644
--- a/astrid/res/layout/tag_updates_header.xml
+++ b/astrid/res/layout/tag_updates_header.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal" >
 
-            <greendroid.widget.AsyncImageView
+            <com.todoroo.astrid.helper.AsyncImageView
                 android:id="@+id/tag_picture"
                 android:layout_width="80dip"
                 android:layout_height="80dip"
diff --git a/astrid/res/layout/task_adapter_draggable_row.xml b/astrid/res/layout/task_adapter_draggable_row.xml
new file mode 100644
index 000000000..d354da823
--- /dev/null
+++ b/astrid/res/layout/task_adapter_draggable_row.xml
@@ -0,0 +1,127 @@
+<?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"
+    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="57dip"
+    android:paddingTop="2dip"
+    android:paddingBottom="2dip"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+    
+    <View
+        android:id="@+id/importance_legacy"
+        android:layout_width="4dip"
+        android:layout_height="fill_parent"
+        android:visibility="gone" />
+        
+    <!-- indent -->
+    <View android:id="@+id/indent"
+        android:layout_width="0dip"
+        android:layout_height="fill_parent"/>
+    
+    <!-- grabber -->
+    <ImageView android:id="@+id/grabber"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:scaleType="center"
+        android:src="@drawable/grabber"/>
+
+    <RelativeLayout android:id="@+id/rowBody" 
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@android:drawable/list_selector_background"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:paddingLeft="5dip">        
+                
+        
+        <com.todoroo.astrid.ui.CheckableImageView
+	        android:id="@+id/completeBox"
+	        android:layout_width="45dip"
+	        android:layout_height="wrap_content"
+	        android:minHeight="30dip"
+	        android:scaleType="center"
+	        android:layout_alignParentTop="true"
+	        android:layout_marginLeft="2dip"
+	        android:button="@drawable/btn_check" />
+    <!-- assignee photo -->
+
+	    <com.todoroo.astrid.helper.AsyncImageView
+	        android:id="@+id/picture"
+	        android:layout_width="35dip"
+	        android:layout_height="35dip"
+	        android:layout_marginLeft="10dip"
+	        astrid:defaultSrc="@drawable/icn_default_person_image"
+	        android:scaleType="fitCenter"
+	        android:visibility="gone" />
+            
+        <LinearLayout
+	        android:id="@+id/task_row"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_toRightOf="@id/completeBox"
+	        android:layout_centerVertical="true"
+	        android:orientation="horizontal"
+	        android:gravity="center_vertical"
+	        android:paddingLeft="5dip" >
+
+	        <!-- task name -->
+	
+	        <TextView
+	            android:id="@+id/title"
+	            style="@style/TextAppearance.TAd_ItemTitle"
+	            android:layout_width="fill_parent"
+	            android:layout_height="wrap_content"
+	            android:layout_weight="100"
+	            android:gravity="center_vertical"
+	            android:maxLines="2" />
+	
+	        <!-- due date -->
+	        <LinearLayout
+                android:id="@+id/taskActionContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="40dip"
+                android:layout_marginRight="4dip"
+                android:orientation="vertical"
+                android:gravity="right|center_vertical">
+                <TextView
+	                android:id="@+id/dueDate"
+	                android:layout_width="wrap_content"
+	                android:layout_height="wrap_content"
+	                android:layout_alignParentRight="true"
+	                android:layout_marginRight="4dip"
+	                android:gravity="center_vertical|right" />
+                <ImageView
+                    android:id="@+id/taskActionIcon"
+                    android:layout_width="20dip"
+                    android:layout_height="20dip"
+                    android:scaleType="fitCenter"
+                    android:visibility="gone"/>
+            </LinearLayout>
+        </LinearLayout>
+          
+        <!-- details line 1 -->
+        <TextView android:id="@+id/details1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/task_row"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="-1dip"
+            style="@style/TextAppearance.TAd_ItemDetails"
+            android:visibility="gone" />
+          
+        <!-- details line 2 -->
+        <TextView android:id="@+id/details2"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/details1"
+            android:layout_alignParentLeft="true"
+            style="@style/TextAppearance.TAd_ItemDetails"
+            android:visibility="gone" />
+            
+    </RelativeLayout>
+    
+</LinearLayout>
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index a3e0de467..d111e862f 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -33,7 +33,7 @@
 	        android:scaleType="center"
 	        android:visibility="gone" >
 	    </ImageView>
-	    <greendroid.widget.AsyncImageView
+	    <com.todoroo.astrid.helper.AsyncImageView
 	        android:id="@+id/picture"
 	        android:layout_width="45dip"
 	        android:layout_height="45dip"
@@ -42,8 +42,7 @@
 	        android:layout_centerVertical="true"
 	        astrid:defaultSrc="@drawable/icn_default_person_image"
 	        android:scaleType="fitCenter"
-	        android:visibility="gone" >
-	    </greendroid.widget.AsyncImageView>
+	        android:visibility="gone" />
 	    
 	    <com.todoroo.astrid.ui.CheckableImageView
 	        android:id="@+id/completeBox"
diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml
index 7f5c9f0a5..5db56d96b 100644
--- a/astrid/res/layout/update_adapter_row.xml
+++ b/astrid/res/layout/update_adapter_row.xml
@@ -16,7 +16,7 @@
 	    android:paddingRight="6dip">
 	        
 	    <!-- picture -->
-	    <greendroid.widget.AsyncImageView android:id="@+id/picture"
+	    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/picture"
 	        android:layout_width="40dip"
 	        android:layout_height="40dip"
 	        android:layout_alignParentTop="true"
@@ -52,7 +52,7 @@
 	        
 	    
         <!-- picture -->
-        <greendroid.widget.AsyncImageView android:id="@+id/comment_picture"
+        <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/comment_picture"
             android:layout_width="100dip"
             android:layout_height="100dip"
             android:layout_below="@id/date"
@@ -66,7 +66,7 @@
 	</RelativeLayout>
     
     <!-- picture -->
-    <greendroid.widget.AsyncImageView
+    <com.todoroo.astrid.helper.AsyncImageView
         android:id="@+id/comment_picture"
         android:layout_width="50dip"
         android:layout_height="50dip"
diff --git a/astrid/res/layout/web_service_amazon_row.xml b/astrid/res/layout/web_service_amazon_row.xml
index 8c5007457..984d404b3 100644
--- a/astrid/res/layout/web_service_amazon_row.xml
+++ b/astrid/res/layout/web_service_amazon_row.xml
@@ -7,7 +7,7 @@
     android:background="@android:drawable/list_selector_background">
         
     <!-- imageview -->
-    <greendroid.widget.AsyncImageView android:id="@+id/image"
+    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/image"
         android:layout_width="70dip"
         android:layout_height="100dip"
         android:layout_marginLeft="5dip"
diff --git a/astrid/res/layout/web_service_row.xml b/astrid/res/layout/web_service_row.xml
index a5ed6ae4e..21b4a9ebe 100644
--- a/astrid/res/layout/web_service_row.xml
+++ b/astrid/res/layout/web_service_row.xml
@@ -7,7 +7,7 @@
     android:background="@android:drawable/list_selector_background">
         
     <!-- imageview -->
-    <greendroid.widget.AsyncImageView android:id="@+id/image"
+    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/image"
         android:layout_width="100dip"
         android:layout_height="100dip"
         android:layout_marginLeft="5dip"
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 714c1c523..0f09c32a1 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -109,6 +109,9 @@
   <!-- Tag Settings: list description hint -->
   <string name="actfm_TVA_tag_description_hint">Type a description here</string>
   
+  <!-- Tag Settings: list name hint -->
+  <string name="actfm_TVA_tag_name_hint">Enter list name</string>
+  
   <!-- Tag settings: login prompt from share-->
   <string name="actfm_TVA_login_to_share">You need to be logged in to Astrid.com to share lists! Please log in or make this a private list.</string>
   
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 93a344d73..53f5dabd4 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -387,8 +387,9 @@
     <!-- ========================================================= Tag Settings == -->
     
     <style name="DeleteTag" >
-        <item name="android:textColor">?attr/asTextColor</item>
-        <item name="android:background">?attr/asThemeTextColor</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:background">#d90000</item>
     </style>
     
     <!-- ========================================================= Widget == -->
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
index 3ff039fce..5838dbdc3 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
@@ -365,10 +365,24 @@ public class FilterListFragment extends ListFragment {
         if(label.length() == 0)
             return;
 
-        Bitmap emblem = filter.listingIcon;
+        Bitmap bitmap = superImposeListIcon(activity, filter.listingIcon, filter.listingTitle);
+
+        Intent createShortcutIntent = new Intent();
+        createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+        createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
+        createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, bitmap);
+        createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$
+
+        activity.sendBroadcast(createShortcutIntent);
+        Toast.makeText(activity,
+                activity.getString(R.string.FLA_toast_onCreateShortcut, label), Toast.LENGTH_LONG).show();
+    }
+
+    public static Bitmap superImposeListIcon(Activity activity, Bitmap listingIcon, String listingTitle) {
+        Bitmap emblem = listingIcon;
         if(emblem == null)
             emblem = ((BitmapDrawable) activity.getResources().getDrawable(
-                    TagService.getDefaultImageIDForTag(filter.listingTitle))).getBitmap();
+                    TagService.getDefaultImageIDForTag(listingTitle))).getBitmap();
 
         // create icon by superimposing astrid w/ icon
         DisplayMetrics metrics = new DisplayMetrics();
@@ -381,16 +395,7 @@ public class FilterListFragment extends ListFragment {
         canvas.drawBitmap(emblem, new Rect(0, 0, emblem.getWidth(), emblem.getHeight()),
                 new Rect(bitmap.getWidth() - dimension, bitmap.getHeight() - dimension,
                         bitmap.getWidth(), bitmap.getHeight()), null);
-
-        Intent createShortcutIntent = new Intent();
-        createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-        createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
-        createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, bitmap);
-        createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$
-
-        activity.sendBroadcast(createShortcutIntent);
-        Toast.makeText(activity,
-                activity.getString(R.string.FLA_toast_onCreateShortcut, label), Toast.LENGTH_LONG).show();
+        return bitmap;
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index a1d8e03a4..b35cbc29d 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -3,7 +3,7 @@
  */
 package com.todoroo.astrid.adapter;
 
-import greendroid.widget.AsyncImageView;
+import com.todoroo.astrid.helper.AsyncImageView;
 
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 05fb2b961..2aaed2a6a 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -1,6 +1,6 @@
 package com.todoroo.astrid.adapter;
 
-import greendroid.widget.AsyncImageView;
+import com.todoroo.astrid.helper.AsyncImageView;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index cb3a034c8..01cf52582 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -1,6 +1,6 @@
 package com.todoroo.astrid.adapter;
 
-import greendroid.widget.AsyncImageView;
+import com.todoroo.astrid.helper.AsyncImageView;
 
 import java.io.IOException;
 
diff --git a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
new file mode 100644
index 000000000..b1d436805
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
@@ -0,0 +1,67 @@
+package com.todoroo.astrid.helper;
+
+import java.io.IOException;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+
+
+/*
+ * Subclass of greendroid.widget.AsyncImageView, so that we can cache the image locally when user is offline
+ * IMPORTANT: cannot load a cached image by setting the url in an xml file. --ImageDiskCache object is created after object is loaded from xml
+ */
+public class AsyncImageView extends greendroid.widget.AsyncImageView {
+
+    private final ImageDiskCache imageDiskCache;
+    private Bitmap cacheImage;
+    private String cacheURL = ""; //$NON-NLS-1$
+    public AsyncImageView(Context context) {
+        super(context);
+
+        imageDiskCache = ImageDiskCache.getInstance();
+    }
+    public AsyncImageView(Context context, AttributeSet set) {
+        super(context, set);
+        imageDiskCache = ImageDiskCache.getInstance();
+    }
+    public AsyncImageView(Context context, AttributeSet set, int defStyle) {
+        super(context, set, defStyle);
+        imageDiskCache = ImageDiskCache.getInstance();
+    }
+    @Override
+    public void setUrl(String url) {
+        if (cacheImage != null && cacheURL.equals(url) && !TextUtils.isEmpty(url)) {
+            setImageBitmap(cacheImage);
+            return;
+        }
+        else if(imageDiskCache != null && imageDiskCache.contains(url)) {
+            try {
+                cacheImage = imageDiskCache.get(url);
+                setImageBitmap(cacheImage);
+                cacheURL = url;
+                return;
+            } catch (IOException e) {
+                //
+            }
+        }
+        super.setUrl(url);
+    }
+
+    public Bitmap getImageBitmap() {
+        setDrawingCacheEnabled(true);
+
+        // this is the important code :)
+        // Without it the view will have a dimension of 0,0 and the bitmap will be null
+        measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+                MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+        layout(0, 0, getMeasuredWidth(), getMeasuredHeight());
+
+        buildDrawingCache(true);
+        Bitmap b = Bitmap.createBitmap(getDrawingCache());
+        setDrawingCacheEnabled(false); // clear drawing cache
+        return b;
+    }
+
+}
diff --git a/astrid/src/com/todoroo/astrid/helper/ImageDiskCache.java b/astrid/src/com/todoroo/astrid/helper/ImageDiskCache.java
index f601eec11..dcf5ae847 100644
--- a/astrid/src/com/todoroo/astrid/helper/ImageDiskCache.java
+++ b/astrid/src/com/todoroo/astrid/helper/ImageDiskCache.java
@@ -19,14 +19,20 @@ package com.todoroo.astrid.helper;
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Date;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.astrid.data.TagData;
+import com.todoroo.astrid.data.Update;
 
 /**
  * <p>
@@ -46,18 +52,19 @@ import com.todoroo.andlib.service.ContextManager;
  */
 @SuppressWarnings("nls")
 public class ImageDiskCache extends DiskCache<String, Bitmap> {
-	private static final String TAG = ImageDiskCache.class.getSimpleName();
+    private static final String TAG = ImageDiskCache.class.getSimpleName();
+    public static final String CACHED_IDENTIFIER = "cached::";
 
-	static final boolean DEBUG = false;
+    static final boolean DEBUG = false;
 
 
-	private long mIDCounter = 0;
+    private long mIDCounter = 0;
 
-	private static ImageDiskCache mInstance;
+    private static ImageDiskCache mInstance;
 
 
-	private final CompressFormat mCompressFormat;
-	private final int mQuality;
+    private final CompressFormat mCompressFormat;
+    private final int mQuality;
 
     public static ImageDiskCache getInstance() {
         if (mInstance == null) {
@@ -66,109 +73,136 @@ public class ImageDiskCache extends DiskCache<String, Bitmap> {
         return mInstance;
     }
 
-	private ImageDiskCache(File file, CompressFormat format, int quality) {
-		super(file, null, getExtension(format));
+    public static ImageDiskCache getInstance(Context context) {
+        if (mInstance == null) {
+            mInstance = new ImageDiskCache(context.getCacheDir(), CompressFormat.JPEG, 85);
+        }
+        return mInstance;
+    }
+
+    private ImageDiskCache(File file, CompressFormat format, int quality) {
+        super(file, null, getExtension(format));
 
-		mCompressFormat = format;
-		mQuality = quality;
-	}
+        mCompressFormat = format;
+        mQuality = quality;
+    }
     private static String getExtension(CompressFormat format) {
-		String extension;
-		switch (format) {
-		case JPEG:
-			extension = ".jpg";
-			break;
-
-		case PNG:
-			extension = ".png";
-			break;
-
-		default:
-			throw new IllegalArgumentException();
-		}
-
-		return extension;
-	}
-
-	/**
-	 * If loading a number of images where you don't have a unique ID to
-	 * represent the individual load, this can be used to generate a sequential
-	 * ID.
-	 *
-	 * @return a new unique ID
-	 */
-	public synchronized long getNewID() {
-		return mIDCounter++;
-	}
-
-	@Override
-	protected Bitmap fromDisk(String key, InputStream in) {
-
-		if (DEBUG) {
-			Log.d(TAG, "disk cache hit");
-		}
-		try {
-			final Bitmap image = BitmapFactory.decodeStream(in);
-			return image;
-
-		} catch (final OutOfMemoryError oom) {
-			return null;
-		}
-	}
-
-	@Override
-	protected void toDisk(String key, Bitmap image, OutputStream out) {
-		if (DEBUG) {
-			Log.d(TAG, "cache write for key " + key);
-		}
-		if (image != null) {
-			if (!image.compress(mCompressFormat, mQuality, out)) {
-				Log.e(TAG, "error writing compressed image to disk for key "
-						+ key);
-			}
-		} else {
-			Log.e(TAG, "attempting to write null image to cache");
-		}
-	}
-
-
-	/**
-	 * @param uri
-	 *            the image uri
-	 * @return a key unique to the given uri
-	 */
-	public String getKey(Uri uri) {
-		return uri.toString();
-	}
-
-
-	/**
-	 * Returns an opaque cache key representing the given uri, width and height.
-	 *
-	 * @param uri
-	 *            an image uri
-	 * @param width
-	 *            the desired image max width
-	 * @param height
-	 *            the desired image max height
-	 * @return a cache key unique to the given parameters
-	 */
-	public String getKey(Uri uri, int width, int height) {
-		return uri.buildUpon()
-				.appendQueryParameter("width", String.valueOf(width))
-				.appendQueryParameter("height", String.valueOf(height)).build()
-				.toString();
-	}
-
-
-
-	/**
-	 * Cancels all the asynchronous image loads.
-	 * Note: currently does not function properly.
-	 *
-	 */
-	public void cancelLoads() {
-		// TODO actually make it possible to cancel tasks
-	}
+        String extension;
+        switch (format) {
+        case JPEG:
+            extension = ".jpg";
+            break;
+
+        case PNG:
+            extension = ".png";
+            break;
+
+        default:
+            throw new IllegalArgumentException();
+        }
+
+        return extension;
+    }
+
+    /**
+     * If loading a number of images where you don't have a unique ID to
+     * represent the individual load, this can be used to generate a sequential
+     * ID.
+     *
+     * @return a new unique ID
+     */
+    public synchronized long getNewID() {
+        return mIDCounter++;
+    }
+
+    @Override
+    protected Bitmap fromDisk(String key, InputStream in) {
+
+        if (DEBUG) {
+            Log.d(TAG, "disk cache hit");
+        }
+        try {
+            final Bitmap image = BitmapFactory.decodeStream(in);
+            return image;
+
+        } catch (final OutOfMemoryError oom) {
+            return null;
+        }
+    }
 
+    @Override
+    protected void toDisk(String key, Bitmap image, OutputStream out) {
+        if (DEBUG) {
+            Log.d(TAG, "cache write for key " + key);
+        }
+        if (image != null) {
+            if (!image.compress(mCompressFormat, mQuality, out)) {
+                Log.e(TAG, "error writing compressed image to disk for key "
+                        + key);
+            }
+        } else {
+            Log.e(TAG, "attempting to write null image to cache");
+        }
+    }
+
+
+    /**
+     * @param uri
+     *            the image uri
+     * @return a key unique to the given uri
+     */
+    public String getKey(Uri uri) {
+        return uri.toString();
+    }
+
+
+    /**
+     * Returns an opaque cache key representing the given uri, width and height.
+     *
+     * @param uri
+     *            an image uri
+     * @param width
+     *            the desired image max width
+     * @param height
+     *            the desired image max height
+     * @return a cache key unique to the given parameters
+     */
+    public String getKey(Uri uri, int width, int height) {
+        return uri.buildUpon()
+        .appendQueryParameter("width", String.valueOf(width))
+        .appendQueryParameter("height", String.valueOf(height)).build()
+        .toString();
+    }
+
+
+
+    /**
+     * Cancels all the asynchronous image loads.
+     * Note: currently does not function properly.
+     *
+     */
+    public void cancelLoads() {
+        // TODO actually make it possible to cancel tasks
+    }
+
+    @Override
+    public boolean contains(String key) {
+        return !TextUtils.isEmpty(key) && key.startsWith(CACHED_IDENTIFIER) && super.contains(key);
+    }
+
+    public static String getPictureHash(Update update) {
+        return String.format("%s%s%s", CACHED_IDENTIFIER, update.getValue(Update.TASK), update.getValue(Update.CREATION_DATE));
+    }
+
+
+    public static String getPictureHash(TagData tagData) {
+        long tag_date = 0;
+        if (tagData.containsValue(TagData.CREATION_DATE)) {
+            tag_date = tagData.getValue(TagData.CREATION_DATE);
+        }
+        if (tag_date == 0) {
+            tag_date = DateUtilities.dateToUnixtime(new Date());
+        }
+        return String.format("%s%s%s", CACHED_IDENTIFIER,tagData.getValue(TagData.NAME), tag_date);
+    }
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
index a21e35b8b..82597a60f 100644
--- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
+++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.ui;
 
-import greendroid.widget.AsyncImageView;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -25,6 +23,7 @@ import android.widget.TextView.OnEditorActionListener;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
+import com.todoroo.astrid.helper.AsyncImageView;
 
 public class PeopleContainer extends LinearLayout {
 
@@ -83,16 +82,35 @@ public class PeopleContainer extends LinearLayout {
             textView.setHint(R.string.actfm_person_or_tag_hint);
         }
 
+        final ImageButton removeButton = (ImageButton)tagItem.findViewById(R.id.button1);
+        removeButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                TextView lastView = getLastTextView();
+                if(lastView == textView && textView.getText().length() == 0)
+                    return;
+
+                if(getChildCount() > 1)
+                    removeView(tagItem);
+                else {
+                    textView.setText(""); //$NON-NLS-1$
+                    textView.setEnabled(true);
+                }
+            }
+        });
+
         final AsyncImageView imageView = (AsyncImageView)tagItem.
             findViewById(R.id.icon);
         imageView.setUrl(image);
         if (TextUtils.isEmpty(textView.getText())) {
-            imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+            imageView.setDefaultImageResource(R.drawable.icn_add_contact);
+            removeButton.setVisibility(View.GONE);
         }
         else {
-            imageView.setDefaultImageResource(R.drawable.icn_add_contact);
+            imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+            removeButton.setVisibility(View.VISIBLE);
         }
 
+
         textView.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
@@ -108,10 +126,16 @@ public class PeopleContainer extends LinearLayout {
                     int count) {
                 if(count > 0 && getLastTextView() == textView) {
                     addPerson("", ""); //$NON-NLS-1$
-                    imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
                 }
                 else {
+                }
+                if (TextUtils.isEmpty(textView.getText())) {
                     imageView.setDefaultImageResource(R.drawable.icn_add_contact);
+                    removeButton.setVisibility(View.GONE);
+                }
+                else {
+                    imageView.setDefaultImageResource(R.drawable.icn_default_person_image);
+                    removeButton.setVisibility(View.VISIBLE);
                 }
 
                 if(onAddNewPerson != null)
@@ -131,22 +155,6 @@ public class PeopleContainer extends LinearLayout {
             }
         });
 
-        ImageButton removeButton = (ImageButton)tagItem.findViewById(R.id.button1);
-        removeButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                TextView lastView = getLastTextView();
-                if(lastView == textView && textView.getText().length() == 0)
-                    return;
-
-                if(getChildCount() > 1)
-                    removeView(tagItem);
-                else {
-                    textView.setText(""); //$NON-NLS-1$
-                    textView.setEnabled(true);
-                }
-            }
-        });
-
         return textView;
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/WebServicesView.java b/astrid/src/com/todoroo/astrid/ui/WebServicesView.java
index 053fbfb25..18f514651 100644
--- a/astrid/src/com/todoroo/astrid/ui/WebServicesView.java
+++ b/astrid/src/com/todoroo/astrid/ui/WebServicesView.java
@@ -1,6 +1,6 @@
 package com.todoroo.astrid.ui;
 
-import greendroid.widget.AsyncImageView;
+import com.todoroo.astrid.helper.AsyncImageView;
 
 import java.io.IOException;
 import java.io.StringReader;

From e6b2afc3b56e995f086beba75ae4f76764e97702 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Wed, 22 Feb 2012 14:39:53 -0800
Subject: [PATCH 5/5] Fixed dissappearing comments in recent activity

---
 .../com/todoroo/astrid/actfm/TagUpdatesFragment.java         | 1 +
 .../com/todoroo/astrid/notes/EditNoteActivity.java           | 1 +
 astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java     | 5 ++---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
index 007f7bc02..8546b5202 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
@@ -321,6 +321,7 @@ public class TagUpdatesFragment extends ListFragment {
         update.setValue(Update.TAGS, "," + tagData.getValue(TagData.REMOTE_ID) + ",");
         update.setValue(Update.TAGS_LOCAL, "," + tagData.getId() + ",");
         update.setValue(Update.CREATION_DATE, DateUtilities.now());
+        update.setValue(Update.TARGET_NAME, tagData.getValue(TagData.NAME));
         if (picture != null) {
             update.setValue(Update.PICTURE, Update.PICTURE_LOADING);
             try {
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index eb090f7f0..67ada551f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -430,6 +430,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             update.setValue(Update.TASK, task.getValue(Task.REMOTE_ID));
         update.setValue(Update.TASK_LOCAL, task.getId());
         update.setValue(Update.CREATION_DATE, DateUtilities.now());
+        update.setValue(Update.TARGET_NAME, task.getValue(Task.TITLE));
 
         if (usePicture && pendingCommentPicture != null) {
             update.setValue(Update.PICTURE, Update.PICTURE_LOADING);
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index 01cf52582..30e8ebf05 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -261,14 +261,13 @@ public class UpdateAdapter extends CursorAdapter {
             commentResource = R.string.update_string_task_assigned;
         }
         else if (actionCode.equals(UPDATE_TASK_COMMENT)) {
-            if (fromView.equals(FROM_TASK_VIEW))
+            if (fromView.equals(FROM_TASK_VIEW) || TextUtils.isEmpty(targetName))
                 commentResource = R.string.update_string_default_comment;
             else
                 commentResource = R.string.update_string_task_comment;
-
         }
         else if (actionCode.equals(UPDATE_TAG_COMMENT)) {
-            if (fromView.equals(FROM_TAG_VIEW))
+            if (fromView.equals(FROM_TAG_VIEW)  || TextUtils.isEmpty(targetName))
                 commentResource = R.string.update_string_default_comment;
             else
                 commentResource = R.string.update_string_tag_comment;