Replace the task edit delete menu item with a button directly in the layout

astrid/res/layout/task_edit_activity.xml

@@ -87,6 +87,13 @@
                 android:text="@string/EPr_beastMode_shortcut"
                 android:textColor="?attr/asTextColor"/>
             
+            <ImageView
+                android:id="@+id/delete_task"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:layout_marginBottom="10dip"
+                android:background="#ff0000"/>
+            
         </LinearLayout>
     </com.todoroo.astrid.ui.NestableScrollView>
 

astrid/res/values/strings-core.xml

@@ -238,7 +238,7 @@
   <string name="SSD_deleted">Show deleted tasks</string>
   
   <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Drag &amp; drop with subtasks</string>
+  <string name="SSD_sort_drag">Manual order with subtasks</string>
   
   <!-- slide 23b: Sort Selection: smart sort -->
   <string name="SSD_sort_auto">Smart sort</string>

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

@@ -178,7 +178,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
     private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
-    private static final int MENU_DELETE_ID = R.string.TEA_menu_delete;
     private static final int MENU_COMMENTS_REFRESH_ID = R.string.TEA_menu_refresh_comments;
     private static final int MENU_SHOW_COMMENTS_ID = R.string.TEA_menu_comments;
     private static final int MENU_ATTACH_ID = R.string.premium_attach_file;
@@ -619,6 +618,13 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         setupBeastModeButton();
 
+        getView().findViewById(R.id.delete_task).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                deleteButtonClick();
+            }
+        });
+
         loadEditPageOrder(false);
 
         // Load task data in background
@@ -1192,9 +1198,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         case MENU_DISCARD_ID:
             discardButtonClick();
             return true;
-        case MENU_DELETE_ID:
-            deleteButtonClick();
-            return true;
         case MENU_ATTACH_ID:
             startAttachFile();
             return true;
@@ -1260,9 +1263,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }
 
-        item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_menu_delete);
-        item.setIcon(android.R.drawable.ic_menu_delete);
-
     }
 
     @Override