Adjust filter adapter row height and layout

astrid/res/layout-land/filter_list_activity.xml

@@ -14,6 +14,7 @@
         android:layout_alignParentTop="true"
         android:scrollbars="vertical"
         android:divider="@android:color/transparent"
+        android:dividerHeight="1px"
         android:background="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     

astrid/res/layout/file_row.xml

@@ -15,7 +15,6 @@
         android:paddingRight="5dip"
         android:layout_weight="1"
         android:textAppearance="@style/TextAppearance.EditRowDisplay"
-        android:background="@drawable/file_name_background"
         android:gravity="right|center_vertical"/>
     <TextView
         android:id="@+id/file_type"

astrid/res/layout/filter_adapter_row.xml

@@ -4,7 +4,7 @@
      are defined in FilterAdapter.java -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="58dip"
+    android:layout_height="55dip"
     android:orientation="horizontal">
         
     <!-- filter icon -->
@@ -12,7 +12,7 @@
         android:layout_width="25dip"
         android:layout_height="48dip"
         android:layout_alignParentLeft="true"
-        android:layout_marginTop="4dp" 
+        android:layout_centerVertical="true"
         android:layout_marginLeft="8dip"
         android:scaleType="fitCenter"
         android:visibility="gone"/>
@@ -22,7 +22,7 @@
         android:layout_width="30dip"
         android:layout_height="48dip"
         android:layout_alignParentLeft="true"
-        android:layout_marginTop="4dp" 
+        android:layout_centerVertical="true"
         android:layout_marginLeft="6dip"
         android:scaleType="fitCenter"
         android:visibility="gone"/>
@@ -35,8 +35,9 @@
         android:paddingRight="30dp"
         android:checked="false"
         android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-        android:lines="2"
-        android:ellipsize="marquee"
+        android:lines="1"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:gravity="center_vertical" />
         
     <!-- size -->
@@ -46,7 +47,7 @@
         android:layout_alignParentRight="true"
         android:background="@drawable/filter_count"
         android:layout_marginRight="5dip"
-        android:layout_marginTop="15dip"
+        android:layout_centerVertical="true"
         android:paddingLeft="7dip" 
         android:paddingRight="7dip"
         android:textColor="#ffffff"

astrid/res/layout/filter_list_activity.xml

@@ -14,6 +14,7 @@
         android:layout_alignParentTop="true"
         android:scrollbars="vertical"
         android:divider="@android:color/transparent"
+        android:dividerHeight="1px"
         android:background="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     

astrid/res/layout/filter_list_activity_3pane.xml

@@ -39,6 +39,7 @@
         android:layout_above="@id/lists_footer"
         android:scrollbars="vertical"
         android:divider="@android:color/transparent"
+        android:dividerHeight="1px"
         android:background="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     

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

@@ -1171,9 +1171,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_menu_delete);
         item.setIcon(android.R.drawable.ic_menu_delete);
-        if (((AstridActivity) getActivity()).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE)
-            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
 
     }
 

astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -513,13 +513,9 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         if(viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
             viewHolder.name.setTextAppearance(activity, headerStyle);
             viewHolder.name.setShadowLayer(1, 1, 1, Color.BLACK);
-            viewHolder.view.setPadding((int) (7 * metrics.density), 5, 0, 5);
-            viewHolder.view.getLayoutParams().height = (int) (40 * metrics.density);
         } else {
             viewHolder.name.setTextAppearance(activity, filterStyle);
             viewHolder.name.setShadowLayer(0, 0, 0, 0);
-            viewHolder.view.setPadding((int) (7 * metrics.density), 2, 0, 2);
-            viewHolder.view.getLayoutParams().height = (int) (58 * metrics.density);
         }
 
         // update with filter attributes (listing icon, url, update text, size)