Put sort and filter button in header

astrid/res/layout/task_list_activity.xml

@@ -34,18 +34,6 @@
 	        android:layout_height="fill_parent"
 	        android:layout_weight="1"
 	        android:orientation="horizontal">
-	    
-	        
-	        <!-- Header Logo -->
-	        <!-- <ImageView android:id="@+id/headerLogo"
-	            android:layout_width="fill_parent"
-	            android:layout_height="fill_parent"
-	            android:layout_weight="100"
-	            android:gravity="center"
-	            android:paddingRight="43dip"
-	            android:src="@drawable/header_logo_new"
-	            android:scaleType="center"
-	            android:visibility="gone"/>  -->
 	           
 	        <!-- List Label -->
 	        <TextView android:id="@+id/listLabel"
@@ -53,7 +41,6 @@
 	            android:layout_height="fill_parent"
 	            android:layout_marginLeft="5dip"
 	            android:layout_marginRight="5dip"
-	            android:paddingRight="50dip"
 	            android:layout_weight="100"
 	            android:singleLine="true"
 	            android:ellipsize="end"
@@ -79,6 +66,23 @@
                 android:src="@drawable/icn_cmmt_off"
                 android:scaleType="fitCenter" /> 
         </LinearLayout>
+        
+       <LinearLayout android:id="@+id/sortContainer"
+          android:layout_width="wrap_content"
+          android:layout_height="fill_parent">
+           <View 
+              android:layout_width="0.5dip"
+              android:layout_height="fill_parent"
+              android:background="#ff222222"/>
+              
+           <ImageView android:id="@+id/sort_settings"
+               android:layout_height="fill_parent"
+               android:layout_width="43dip"
+               android:background="?attr/asHeaderButtonBackground"
+               android:padding="7dip"
+               android:src="@drawable/ic_sort"
+               android:scaleType="fitCenter" /> 
+       </LinearLayout>
 	    
     </LinearLayout>
     

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

@@ -55,6 +55,12 @@ public class DraggableTaskListActivity extends TaskListActivity {
         return getLayoutInflater().inflate(R.layout.task_list_body_draggable, root, false);
     }
 
+    @Override
+    protected void setUpUiComponents() {
+        super.setUpUiComponents();
+        findViewById(R.id.sortContainer).setVisibility(View.GONE);
+    }
+
     // --- task adapter
 
     /**

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

@@ -137,7 +137,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
     protected static final int MENU_LISTS_ID = Menu.FIRST + 1;
     protected static final int MENU_ADDONS_ID = Menu.FIRST + 2;
     protected static final int MENU_SETTINGS_ID = Menu.FIRST + 3;
-    protected static final int MENU_SORT_ID = Menu.FIRST + 4;
     protected static final int MENU_SYNC_ID = Menu.FIRST + 5;
     protected static final int MENU_SUPPORT_ID = Menu.FIRST + 6;
     protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 7;
@@ -301,8 +300,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             isFilter = true;
         } else {
             filter = CoreFilterExposer.buildInboxFilter(getResources());
-            //findViewById(R.id.headerLogo).setVisibility(View.VISIBLE);
-            //findViewById(R.id.listLabel).setVisibility(View.GONE);
             isFilter = false;
         }
 
@@ -331,12 +328,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
 
         MenuItem item;
 
-        if(!(this instanceof DraggableTaskListActivity)) {
-            item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE,
-                    R.string.TLA_menu_sort);
-            item.setIcon(android.R.drawable.ic_menu_sort_by_size);
-        }
-
         addSyncRefreshMenuItem(menu);
 
         item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE,
@@ -377,7 +368,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
         return true;
     }
 
-    private void setUpUiComponents() {
+    protected void setUpUiComponents() {
         ((ImageView)findViewById(R.id.back)).setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 Preferences.setBoolean(R.string.p_showed_lists_help, true);
@@ -385,6 +376,16 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             }
         });
 
+        findViewById(R.id.sort_settings).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT);
+                AlertDialog dialog = SortSelectionActivity.createDialog(TaskListActivity.this,
+                        TaskListActivity.this, sortFlags, sortSort);
+                dialog.show();
+            }
+        });
+
         // set listener for quick-changing task priority
         getListView().setOnKeyListener(new OnKeyListener() {
             @Override
@@ -1204,12 +1205,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             intent = new Intent(this, EditPreferences.class);
             startActivityForResult(intent, ACTIVITY_SETTINGS);
             return true;
-        case MENU_SORT_ID:
-            StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT);
-            AlertDialog dialog = SortSelectionActivity.createDialog(this,
-                    this, sortFlags, sortSort);
-            dialog.show();
-            return true;
         case MENU_SYNC_ID:
             StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SYNC);
             performSyncAction();