Fix for AST-227 - launching app goes straight to filters, back from filters goes straight home

astrid/AndroidManifest.xml

@@ -84,10 +84,10 @@
             <action android:name="android.intent.action.MAIN" />
         </intent-filter>
     </activity>
-
     <!-- Activity that displays filter list -->
     <activity android:name="com.todoroo.astrid.activity.FilterListActivity"
               android:launchMode="singleTop"
+              android:finishOnTaskLaunch="true"
               android:theme="@style/Theme">
       <intent-filter>
         <action android:name="android.intent.action.SEARCH" />
@@ -313,6 +313,7 @@
     </receiver>
     <activity android:name="com.todoroo.astrid.reminders.NotificationActivity"
               android:taskAffinity="com.todoroo.astrid.reminders.NotificationActivity"
+              android:launchMode="singleTask"
               android:screenOrientation="portrait"
               android:clearTaskOnLaunch="true" />
               

astrid/res/layout/task_adapter_row.xml

@@ -19,7 +19,7 @@
     
         <!-- importance -->
         <View android:id="@+id/importance"
-            android:layout_width="2dip"
+            android:layout_width="3dip"
             android:layout_height="fill_parent"
             android:layout_marginRight="5dip" />
             

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -191,6 +191,12 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
 
         database.openForWriting();
         setUpUiComponents();
+        onNewIntent(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
         setUpTaskList();
         if(Constants.DEBUG)
             setTitle("[D] " + filter.title); //$NON-NLS-1$
@@ -264,7 +270,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
                 Intent intent = new Intent(TaskListActivity.this,
                         FilterListActivity.class);
                 startActivity(intent);
-                finish();
             }
         });
 
@@ -871,7 +876,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             Intent intent = new Intent(TaskListActivity.this,
                     FilterListActivity.class);
             startActivity(intent);
-            finish();
         }
     }