Update task edit screen

scripts/find-unused-drawables.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-for DIR in $(ls -d **/src/main/res/drawable*); do
+for DIR in $(ls -d src/main/res/drawable*); do
     for file in $(ls -l ${DIR} | /usr/bin/awk '{ print $9}' | /usr/bin/sed 's/\..\+//g'); do
         if [ ! -f ${DIR}/${file} ]; then
             echo "ignoring ${file}"

scripts/find-unused-layouts.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-for DIR in $(ls -d **/src/main/res/layout*); do
+for DIR in $(ls -d src/main/res/layout*); do
     for file in $(ls -l ${DIR} | /usr/bin/awk '{ print $9}' | /usr/bin/sed 's/\..\+//g'); do
         if [ ! -f ${DIR}/${file} ]; then
             echo -e "ignored ${DIR}/${file}"

src/main/AndroidManifest.xml

@@ -5,8 +5,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.tasks"
-    android:versionName="4.7.2"
+    android:versionName="4.7.3"
-    android:versionCode="338">
+    android:versionCode="339">
 
     <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
     <!--    android:installLocation="internalOnly"> -->

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

@@ -356,8 +356,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         TagsControlSet tagsControlSet = new TagsControlSet(metadataDao, tagDataDao, preferences, tagService, getActivity());
         controls.add(tagsControlSet);
-        controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref),
+        controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref), tagsControlSet);
-                tagsControlSet);
 
         RepeatControlSet repeatControls = new RepeatControlSet(preferences, getActivity());
 
@@ -370,7 +369,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         // otherwise the correct date may not be written to the calendar event.
         // Order matters!
         DeadlineControlSet deadlineControl = new DeadlineControlSet(
-                preferences, getActivity(), R.layout.control_set_deadline_display, repeatControls,
+                preferences, getActivity(), R.layout.control_set_deadline, repeatControls,
                 repeatControls.getDisplayView(), gcalControl.getDisplayView());
         controlSetMap.put(getString(R.string.TEA_ctrl_when_pref),
                 deadlineControl);
@@ -404,8 +403,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         hideUntilControls.getView();
 
         TimerControlSet timerControl = new TimerControlSet(preferences, getActivity(),
+                R.layout.control_set_timers_dialog,
                 R.layout.control_set_timers,
-                R.layout.control_set_default_display,
                 R.string.TEA_timer_controls);
         timerAction.addListener(timerControl);
         controls.add(timerControl);
@@ -453,9 +452,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 }
 
                 if (controlSet != null) {
-                    if ((i + 1 >= itemOrder.length)) {
-                        removeTeaSeparator(controlSet);
-                    }
                     basicControls.addView(controlSet);
                 }
 
@@ -468,15 +464,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         getActivity().getIntent().removeExtra(TOKEN_OPEN_CONTROL);
     }
 
-    private void removeTeaSeparator(View view) {
-
-        View teaSeparator = view.findViewById(R.id.TEA_Separator);
-
-        if (teaSeparator != null) {
-            teaSeparator.setVisibility(View.GONE);
-        }
-    }
-
     private void constructWhenDialog(View whenDialogView) {
         whenDialog = new Dialog(getActivity(), preferences.getEditDialogTheme());
 

src/main/java/com/todoroo/astrid/files/FilesControlSet.java

@@ -16,7 +16,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.webkit.MimeTypeMap;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
@@ -41,8 +40,6 @@ import org.tasks.preferences.ActivityPreferences;
 import java.io.File;
 import java.util.ArrayList;
 
-import static org.tasks.preferences.ResourceResolver.getResource;
-
 public class FilesControlSet extends PopupControlSet {
 
     private static final Logger log = LoggerFactory.getLogger(FilesControlSet.class);
@@ -50,25 +47,18 @@ public class FilesControlSet extends PopupControlSet {
     private final ArrayList<TaskAttachment> files = new ArrayList<>();
     private final LinearLayout fileDisplayList;
     private final LayoutInflater inflater;
-    private final ImageView image;
     private final TaskAttachmentDao taskAttachmentDao;
 
     public FilesControlSet(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, Activity activity) {
-        super(preferences, activity, R.layout.control_set_files, R.layout.control_set_files_display, R.string.TEA_control_files);
+        super(preferences, activity, R.layout.control_set_files_dialog, R.layout.control_set_files, R.string.TEA_control_files);
         this.taskAttachmentDao = taskAttachmentDao;
         fileDisplayList = (LinearLayout) getDisplayView().findViewById(R.id.files_list);
-        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
         inflater = (LayoutInflater) activity.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
     }
 
     @Override
     protected void refreshDisplayView() {
         fileDisplayList.removeAllViews();
-        if (files != null && files.size() > 0) {
-            image.setImageResource(getResource(activity, R.attr.tea_icn_files));
-        } else {
-            image.setImageResource(R.drawable.tea_icn_files_gray);
-        }
         for (final TaskAttachment m : files) {
             View fileRow = inflater.inflate(R.layout.file_display_row, null);
             LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);

src/main/java/com/todoroo/astrid/tags/TagsControlSet.java

@@ -17,7 +17,6 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -46,8 +45,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import static org.tasks.preferences.ResourceResolver.getResource;
-
 /**
  * Control set to manage adding and removing tags
  *
@@ -66,7 +63,6 @@ public final class TagsControlSet extends PopupControlSet {
     private ListView selectedTags;
     private boolean populated = false;
     private HashMap<String, Integer> tagIndices;
-    private final ImageView image;
 
     //private final LinearLayout tagsContainer;
     private final TextView tagsDisplay;
@@ -76,12 +72,11 @@ public final class TagsControlSet extends PopupControlSet {
     private final TagService tagService;
 
     public TagsControlSet(MetadataDao metadataDao, TagDataDao tagDataDao, ActivityPreferences preferences, TagService tagService, Activity activity) {
-        super(preferences, activity, R.layout.control_set_tags, R.layout.control_set_default_display, R.string.TEA_tags_label_long);
+        super(preferences, activity, R.layout.control_set_tag_list, R.layout.control_set_tags, R.string.TEA_tags_label_long);
         this.metadataDao = metadataDao;
         this.tagDataDao = tagDataDao;
         this.tagService = tagService;
         tagsDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     private TagData[] getTagArray() {
@@ -319,11 +314,9 @@ public final class TagsControlSet extends PopupControlSet {
         if (!TextUtils.isEmpty(tagString)) {
             tagsDisplay.setText(tagString);
             tagsDisplay.setTextColor(themeColor);
-            image.setImageResource(getResource(activity, R.attr.tea_icn_lists));
         } else {
             tagsDisplay.setText(R.string.tag_FEx_untagged);
             tagsDisplay.setTextColor(unsetColor);
-            image.setImageResource(R.drawable.tea_icn_lists_gray);
         }
     }
 

src/main/java/com/todoroo/astrid/timers/TimerControlSet.java

@@ -9,7 +9,6 @@ import android.app.Activity;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.todoroo.andlib.data.Property.IntegerProperty;
@@ -22,8 +21,6 @@ import com.todoroo.astrid.ui.TimeDurationControlSet;
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
 
-import static org.tasks.preferences.ResourceResolver.getResource;
-
 /**
  * Control Set for managing repeats
  *
@@ -34,7 +31,6 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
 
     TimeDurationTaskEditControlSet estimated, elapsed;
     private final TextView displayEdit;
-    private final ImageView image;
 
     public TimerControlSet(ActivityPreferences preferences, final Activity activity, int viewLayout, int displayViewLayout, int title) {
         super(preferences, activity, viewLayout, displayViewLayout, title);
@@ -43,8 +39,6 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
         displayEdit.setText(R.string.TEA_timer_controls);
         displayEdit.setTextColor(unsetColor);
 
-        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
-
         estimated = new TimeDurationTaskEditControlSet(activity, getView(), Task.ESTIMATED_SECONDS,R.id.estimatedDuration);
         elapsed = new TimeDurationTaskEditControlSet(activity, getView(), Task.ELAPSED_SECONDS, R.id.elapsedDuration);
     }
@@ -136,11 +130,9 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
         if (!TextUtils.isEmpty(toDisplay)) {
             displayEdit.setText(toDisplay);
             displayEdit.setTextColor(themeColor);
-            image.setImageResource(getResource(activity, R.attr.tea_icn_timer));
         } else {
             displayEdit.setText(R.string.TEA_timer_controls);
             displayEdit.setTextColor(unsetColor);
-            image.setImageResource(R.drawable.tea_icn_timer_gray);
         }
     }
 

src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java

@@ -14,7 +14,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -26,21 +25,17 @@ import com.todoroo.astrid.repeats.RepeatControlSet;
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
 
-import static org.tasks.preferences.ResourceResolver.getResource;
-
 public class DeadlineControlSet extends PopupControlSet {
 
     private DateAndTimePicker dateAndTimePicker;
     private final View[] extraViews;
     private final RepeatControlSet repeatControlSet;
-    private final ImageView image;
 
     public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout,
             RepeatControlSet repeatControlSet, View...extraViews) {
-        super(preferences, activity, R.layout.control_set_deadline, displayViewLayout, 0);
+        super(preferences, activity, R.layout.control_set_deadline_dialog, displayViewLayout, 0);
         this.extraViews = extraViews;
         this.repeatControlSet = repeatControlSet;
-        this.image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     @Override
@@ -66,15 +61,12 @@ public class DeadlineControlSet extends PopupControlSet {
         if (TextUtils.isEmpty(displayString)) {
             dateDisplay.setText(R.string.TEA_deadline_hint);
             dateDisplay.setTextColor(unsetColor);
-            image.setImageResource(R.drawable.tea_icn_date_gray);
         } else {
             dateDisplay.setText(displayString);
             if (isOverdue) {
                 dateDisplay.setTextColor(activity.getResources().getColor(R.color.red_theme_color));
-                image.setImageResource(R.drawable.tea_icn_date_red);
             } else {
                 dateDisplay.setTextColor(themeColor);
-                image.setImageResource(getResource(activity, R.attr.tea_icn_date));
             }
         }
     }

src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java

@@ -13,7 +13,6 @@ import android.text.util.Linkify;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.todoroo.astrid.data.Task;
@@ -21,17 +20,13 @@ import com.todoroo.astrid.data.Task;
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
 
-import static org.tasks.preferences.ResourceResolver.getResource;
-
 public class DescriptionControlSet extends PopupControlSet {
 
     protected EditText editText;
     protected TextView notesPreview;
-    protected ImageView image;
 
     public DescriptionControlSet(ActivityPreferences preferences, Activity activity) {
-        super(preferences, activity, R.layout.control_set_description, R.layout.control_set_notes_display, R.string.TEA_note_label);
+        super(preferences, activity, R.layout.control_set_description_edit, R.layout.control_set_description, R.string.TEA_note_label);
-        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     @Override
@@ -46,11 +41,9 @@ public class DescriptionControlSet extends PopupControlSet {
         if (TextUtils.isEmpty(textToUse)) {
             notesPreview.setText(R.string.TEA_notes_empty);
             notesPreview.setTextColor(unsetColor);
-            image.setImageResource(R.drawable.tea_icn_edit_gray);
         } else {
             notesPreview.setText(textToUse);
             notesPreview.setTextColor(themeColor);
-            image.setImageResource(getResource(activity, R.attr.tea_icn_edit));
         }
 
         linkifyDisplayView();

src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -45,13 +45,11 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
     private Spinner spinner;
     private int previousSetting = Task.HIDE_UNTIL_NONE;
     private int selection;
-    private final ImageView image;
 
     private long existingDate = EXISTING_TIME_UNSET;
 
     public HideUntilControlSet(ActivityPreferences preferences, Activity activity) {
-        super(preferences, activity, R.layout.control_set_hide, R.layout.control_set_default_display, title);
+        super(preferences, activity, R.layout.control_set_hide_spinner, R.layout.control_set_hide, title);
-        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     private ArrayAdapter<HideUntilValue> adapter;
@@ -197,7 +195,6 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
         if (value.setting == Task.HIDE_UNTIL_NONE) {
             auxDisplay.setText(R.string.TEA_hideUntil_label);
             auxDisplay.setTextColor(unsetColor);
-            image.setImageResource(R.drawable.tea_icn_hide_gray);
         } else {
             String display = value.toString();
             if (value.setting != Task.HIDE_UNTIL_SPECIFIC_DAY && value.setting != Task.HIDE_UNTIL_SPECIFIC_DAY_TIME) {
@@ -206,7 +203,6 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
             auxDisplay.setText(activity.getString(R.string.TEA_hideUntil_display, display));
             auxDisplay.setTextColor(themeColor);
-            image.setImageResource(getResource(activity, R.attr.tea_icn_hide));
         }
     }
 

src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java

@@ -42,7 +42,6 @@ public class ReminderControlSet extends PopupControlSet {
     private LinearLayout remindersBody;
     private final List<View> extraViews;
     private final TextView label;
-    private final ImageView image;
 
     private RandomReminderControlSet randomControlSet;
     private AlarmControlSet alarmControl;
@@ -50,12 +49,10 @@ public class ReminderControlSet extends PopupControlSet {
 
     public ReminderControlSet(ActivityPreferences preferences, AlarmService alarmService,
                               Activity activity) {
-        super(preferences, activity, R.layout.control_set_reminders, R.layout.control_set_default_display, R.string.TEA_reminders_group_label);
+        super(preferences, activity, R.layout.control_set_reminders_dialog, R.layout.control_set_reminders, R.string.TEA_reminders_group_label);
         this.alarmService = alarmService;
         extraViews = new ArrayList<>();
         label = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-
-        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     public void addViewToBody(View v) {
@@ -222,11 +219,9 @@ public class ReminderControlSet extends PopupControlSet {
 
             label.setText(toDisplay);
             label.setTextColor(themeColor);
-            image.setImageResource(getResource(activity, R.attr.tea_icn_reminder));
         } else {
             label.setText(R.string.TEA_reminders_group_label);
             label.setTextColor(unsetColor);
-            image.setImageResource(R.drawable.tea_icn_reminder_gray);
         }
     }
 }

src/main/res/layout/control_set_deadline.xml

@@ -1,11 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!-- 
 ** Copyright (c) 2012 Todoroo Inc
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<com.todoroo.astrid.ui.DateAndTimePicker xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/date_and_time"
+    android:layout_width="match_parent"
-    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
-    android:layout_height="fill_parent"
+    android:orientation="horizontal">
-    android:orientation="vertical" />
+
+    <ImageView
+        android:src="@drawable/ic_action_clock"
+        android:contentDescription="@string/TEA_deadline_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:padding="@dimen/task_edit_drawable_padding" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/display_row_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:gravity="start"
+            android:textColor="?attr/asThemeTextColor"
+            android:textSize="@dimen/task_edit_text_size"
+            android:paddingTop="@dimen/task_edit_padding_top_bottom"
+            android:paddingBottom="@dimen/task_edit_padding_top_bottom"
+            android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
+            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom"
+            android:paddingRight="@dimen/task_edit_padding_right"
+            android:paddingEnd="@dimen/task_edit_padding_right"/>
+
+        <include layout="@layout/task_edit_divider"/>
+
+    </LinearLayout>
+
+</LinearLayout>

src/main/res/layout/control_set_deadline_dialog.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
+<com.todoroo.astrid.ui.DateAndTimePicker xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/date_and_time"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" />

src/main/res/layout/control_set_deadline_display.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content">
-      <LinearLayout
-        android:id="@+id/display_row_body"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="50dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:gravity="center_vertical">
-        <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"/>
-	     <TextView
-	         android:id="@+id/display_row_edit"
-		     android:layout_width="fill_parent"
-	         android:layout_height="wrap_content"
-		     android:layout_weight="1"
-	         android:gravity="left"
-             android:textColor="?attr/asThemeTextColor" />
-      </LinearLayout>
-      <View
-	      android:id="@+id/TEA_Separator"
-	      android:layout_width="fill_parent"
-	      android:layout_height="1px"
-          android:background="?android:attr/listDivider" />
-
-    
-</LinearLayout>

src/main/res/layout/control_set_default_display.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content">
-      <LinearLayout
-        android:id="@+id/display_row_body"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:gravity="center_vertical">
-        
-         <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"
-             android:scaleType="fitCenter"/>
-	     <TextView
-	         android:id="@+id/display_row_edit"
-		     android:layout_width="fill_parent"
-	         android:layout_height="wrap_content"
-		     android:layout_weight="1"
-	         android:gravity="left"
-             android:textColor="?attr/asThemeTextColor" />
-      </LinearLayout>
-      <View
-	      android:id="@+id/TEA_Separator"
-	      android:layout_width="fill_parent"
-	      android:layout_height="1px"
-          android:background="?android:attr/listDivider" />
-
-    
-</LinearLayout>

src/main/res/layout/control_set_description.xml

@@ -1,47 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!-- 
 ** Copyright (c) 2012 Todoroo Inc
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
-  android:orientation="vertical"
+    android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+    android:orientation="horizontal">
-  android:layout_height="fill_parent"
-  android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-  
-  <!-- notes -->
-  <ScrollView
-      android:layout_width="fill_parent"
-   	  android:layout_height="wrap_content"
-      android:layout_weight="100">
-	  <LinearLayout
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:gravity="center_vertical">
 
-        <EditText
+    <ImageView
-	      android:id="@+id/notes"
+        android:src="@drawable/ic_action_list"
-	      android:layout_width="wrap_content"
+        android:contentDescription="@string/TEA_note_label"
-	      android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
-	      android:minHeight="100dip"
+        android:layout_height="wrap_content"
-	      android:layout_marginLeft="9dip"
+        android:layout_gravity="top"
-	      android:layout_marginRight="9dip"
+        android:padding="@dimen/task_edit_drawable_padding" />
-	      android:layout_marginTop="5dip"
+
-	      android:layout_weight="100"
+    <LinearLayout
-	      android:scrollbars="vertical"
+        android:layout_width="fill_parent"
-	      android:gravity="top"
+        android:layout_height="wrap_content"
-	      android:background="@null"
+        android:orientation="vertical">
-	      android:hint="@string/TEA_notes_hint"
+
-	      android:autoText="true"
+        <TextView
-	      android:capitalize="sentences"
+            android:id="@+id/display_row_edit"
-	      android:singleLine="false"
+            android:layout_width="match_parent"
-	      android:textColor="?attr/asTextColor"
+            android:layout_height="wrap_content"
-	      android:freezesText="true" />
+            android:layout_gravity="center_vertical"
-	  </LinearLayout>
+            android:gravity="start"
-  </ScrollView>
+            android:textColor="?attr/asThemeTextColor"
-  <include layout="@layout/control_dialog_ok"/>
+            android:textSize="@dimen/task_edit_text_size"
+            android:paddingTop="@dimen/task_edit_padding_top_bottom"
+            android:paddingBottom="@dimen/task_edit_padding_top_bottom"
+            android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
+            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom"
+            android:paddingRight="@dimen/task_edit_padding_right"
+            android:paddingEnd="@dimen/task_edit_padding_right" />
+
+        <include layout="@layout/task_edit_divider" />
+
+    </LinearLayout>
 </LinearLayout>

src/main/res/layout/control_set_description_edit.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:paddingLeft="5dip"
+  android:paddingRight="5dip">
+  
+  <!-- notes -->
+  <ScrollView
+      android:layout_width="fill_parent"
+   	  android:layout_height="wrap_content"
+      android:layout_weight="100">
+	  <LinearLayout
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:gravity="center_vertical">
+
+        <EditText
+	      android:id="@+id/notes"
+	      android:layout_width="wrap_content"
+	      android:layout_height="wrap_content"
+	      android:minHeight="100dip"
+	      android:layout_marginLeft="9dip"
+	      android:layout_marginRight="9dip"
+	      android:layout_marginTop="5dip"
+	      android:layout_weight="100"
+	      android:scrollbars="vertical"
+	      android:gravity="top"
+	      android:background="@null"
+	      android:hint="@string/TEA_notes_hint"
+	      android:autoText="true"
+	      android:capitalize="sentences"
+	      android:singleLine="false"
+	      android:textColor="?attr/asTextColor"
+	      android:freezesText="true" />
+	  </LinearLayout>
+  </ScrollView>
+  <include layout="@layout/control_dialog_ok"/>
+</LinearLayout>