Created control_set_template

Reminder control not being laid out properly

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

@@ -31,6 +31,7 @@ import android.webkit.MimeTypeMap;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
@@ -83,6 +84,7 @@ import org.tasks.location.GeofenceService;
 import org.tasks.location.LocationApi;
 import org.tasks.notifications.NotificationManager;
 import org.tasks.preferences.ActivityPreferences;
+import org.tasks.preferences.ResourceResolver;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -174,6 +176,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     @Inject ActFmCameraModule actFmCameraModule;
     @Inject GeofenceService geofenceService;
     @Inject LocationApi locationApi;
+    @Inject ResourceResolver resourceResolver;
 
     // --- UI components
 
@@ -362,7 +365,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         // deadline control, because
         // 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);
+        DeadlineControlSet deadlineControl = new DeadlineControlSet(preferences, getActivity());
         controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl);
         controls.add(repeatControls);
 
@@ -392,10 +395,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         // TODO: Fix the fact that hideUntil doesn't update accordingly with date changes when lazy loaded. Until then, don't lazy load.
         hideUntilControls.getView();
 
-        TimerControlSet timerControl = new TimerControlSet(preferences, getActivity(),
+        TimerControlSet timerControl = new TimerControlSet(preferences, getActivity());
-                R.layout.control_set_timers_dialog,
-                R.layout.control_set_timers,
-                R.string.TEA_timer_controls);
         timerAction.addListener(timerControl);
         controls.add(timerControl);
         controlSetMap.put(getString(R.string.TEA_ctrl_timer_pref), timerControl);
@@ -442,6 +442,10 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 }
 
                 if (controlSet != null) {
+                    ImageView icon = (ImageView) controlSet.findViewById(R.id.icon);
+                    if (icon != null) {
+                        icon.setImageResource(resourceResolver.getResource(curr.getIcon()));
+                    }
                     basicControls.addView(controlSet);
                 }
 
@@ -566,7 +570,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 controlSet.readFromTask(model);
             }
         }
-
     }
 
     /** Save task model from values in UI components */

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

@@ -74,6 +74,11 @@ public class FilesControlSet extends PopupControlSet {
         refreshDisplayView();
     }
 
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_attachment;
+    }
+
     public void refreshMetadata() {
         if (model != null) {
             files.clear();

src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -246,4 +246,9 @@ public class GCalControlSet extends TaskEditControlSetBase {
             }
         }
     }
+
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_calendar_month;
+    }
 }

src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java

@@ -10,4 +10,6 @@ public interface TaskEditControlSet {
     void readFromTask(Task task);
 
     void writeToModel(Task task);
+
+    int getIcon();
 }

src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java

@@ -12,6 +12,7 @@ import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.LinearLayout;
 
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.ui.EditDialogOkBackground;
@@ -29,6 +30,7 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet {
 
     protected final Activity activity;
     private final int viewLayout;
+    private boolean useTemplate;
     private View view;
     protected Task model;
     protected boolean initialized = false;
@@ -36,8 +38,13 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet {
     protected final int unsetColor;
 
     public TaskEditControlSetBase(Activity activity, int viewLayout) {
+        this(activity, viewLayout, true);
+    }
+
+    public TaskEditControlSetBase(Activity activity, int viewLayout, boolean useTemplate) {
         this.activity = activity;
         this.viewLayout = viewLayout;
+        this.useTemplate = useTemplate;
         if (viewLayout == -1) {
             initialized = true;
         }
@@ -46,11 +53,19 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet {
         unsetColor = getData(activity, R.attr.asTextColorHint);
     }
 
+    protected View inflateWithTemplate(int layout) {
+        LayoutInflater layoutInflater = LayoutInflater.from(activity);
+        View template = layoutInflater.inflate(R.layout.control_set_template, null);
+        LinearLayout content = (LinearLayout) template.findViewById(R.id.content);
+        content.addView(layoutInflater.inflate(layout, null));
+        return template;
+    }
+
     @Override
     public View getView() {
         if (view == null && !initialized) {
             if (viewLayout != -1) {
-                view = LayoutInflater.from(activity).inflate(viewLayout, null);
+                view = useTemplate ? inflateWithTemplate(viewLayout) : LayoutInflater.from(activity).inflate(viewLayout, null);
                 afterInflate();
                 setupOkButton(view);
             }

src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -89,7 +89,7 @@ public class RepeatControlSet extends PopupControlSet {
     private final List<RepeatChangedListener> listeners = new LinkedList<>();
 
     public interface RepeatChangedListener {
-        public void repeatChanged(boolean repeat);
+        void repeatChanged(boolean repeat);
     }
 
     // --- implementation
@@ -192,6 +192,11 @@ public class RepeatControlSet extends PopupControlSet {
         refreshDisplayView();
     }
 
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_reload;
+    }
+
     @Override
     protected void readFromTaskOnInitialize() {
         Date date;

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

@@ -247,6 +247,11 @@ public final class TagsControlSet extends PopupControlSet {
         }
     }
 
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_tags;
+    }
+
     @Override
     protected void readFromTaskOnInitialize() {
         newTags.removeAllViews();

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

@@ -112,9 +112,14 @@ public class TimerActionControlSet extends TaskEditControlSetBase {
         }
     }
 
+    @Override
+    public int getIcon() {
+        return -1;
+    }
+
     public interface TimerActionListener {
-        public void timerStopped(Task task);
+        void timerStopped(Task task);
-        public void timerStarted(Task task);
+        void timerStarted(Task task);
     }
 
     public void addListener(TimerActionListener listener) {

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

@@ -32,8 +32,8 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
     TimeDurationTaskEditControlSet estimated, elapsed;
     private final TextView displayEdit;
 
-    public TimerControlSet(ActivityPreferences preferences, final Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public TimerControlSet(ActivityPreferences preferences, final Activity activity) {
-        super(preferences, activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, R.layout.control_set_timers_dialog, R.layout.control_set_timers, R.string.TEA_timer_controls);
 
         displayEdit = (TextView) getView().findViewById(R.id.display_row_edit);
         displayEdit.setText(R.string.TEA_timer_controls);
@@ -62,6 +62,11 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
         }
     }
 
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_alarm;
+    }
+
     // --- TimeDurationTaskEditControlSet
 
     /**
@@ -102,6 +107,11 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
             }
             return null;
         }
+
+        @Override
+        public int getIcon() {
+            return -1;
+        }
     }
 
     @Override

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

@@ -28,8 +28,8 @@ public class DeadlineControlSet extends PopupControlSet {
 
     private DateAndTimePicker dateAndTimePicker;
 
-    public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout) {
+    public DeadlineControlSet(ActivityPreferences preferences, Activity activity) {
-        super(preferences, activity, R.layout.control_set_deadline_dialog, displayViewLayout, 0);
+        super(preferences, activity, R.layout.control_set_deadline_dialog, R.layout.control_set_deadline, 0);
     }
 
     @Override
@@ -102,4 +102,9 @@ public class DeadlineControlSet extends PopupControlSet {
     private void initializeWithDate(long dueDate) {
         dateAndTimePicker.initializeWithDate(dueDate);
     }
+
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_clock;
+    }
 }

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

@@ -35,4 +35,9 @@ public class DescriptionControlSet extends TaskEditControlSetBase {
     protected void writeToModelAfterInitialized(Task task) {
         task.setNotes(editText.getText().toString().trim());
     }
+
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_list;
+    }
 }

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

@@ -144,6 +144,11 @@ public class EditTitleControlSet implements TaskEditControlSet, ImportanceChange
         }
     }
 
+    @Override
+    public int getIcon() {
+        return -1;
+    }
+
     @Override
     public View getView() {
         throw new RuntimeException();

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

@@ -235,6 +235,11 @@ public class HideUntilControlSet extends TaskEditControlSetBase implements OnIte
         super.readFromTask(task);
     }
 
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_box;
+    }
+
     @Override
     protected void readFromTaskOnInitialize() {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

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

@@ -37,7 +37,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase {
     private static final int TEXT_SIZE = 18;
 
     public interface ImportanceChangedListener {
-        public void importanceChanged(int i);
+        void importanceChanged(int i);
     }
 
     public ImportanceControlSet(Activity activity) {
@@ -88,7 +88,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase {
             final ToggleButton button = new ToggleButton(activity);
             LinearLayout.LayoutParams params;
 
-            int dimension = 38;
+            int dimension = 25;
             params = new LinearLayout.LayoutParams((int) (metrics.density * dimension), (int) (metrics.density * dimension));
             button.setLayoutParams(params);
 
@@ -117,7 +117,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase {
             buttons.add(button);
 
             View padding = new View(activity);
-            LinearLayout.LayoutParams paddingParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            LinearLayout.LayoutParams paddingParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, 0);
             paddingParams.weight = 1.0f;
             padding.setLayoutParams(paddingParams);
             container.addView(padding);
@@ -131,6 +131,11 @@ public class ImportanceControlSet extends TaskEditControlSetBase {
         setImportance(model.getImportance());
     }
 
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_flag;
+    }
+
     // Same as above because we need the setImportance listeners to fire even in
     // the case when the UI hasn't been created yet
     @Override

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

@@ -9,7 +9,6 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
@@ -31,7 +30,7 @@ public abstract class PopupControlSet extends TaskEditControlSetBase {
     private final String titleString;
 
     public interface PopupDialogClickListener {
-        public boolean onClick(DialogInterface d, int which);
+        boolean onClick(DialogInterface d, int which);
     }
 
     final PopupDialogClickListener okListener = new PopupDialogClickListener() {
@@ -49,10 +48,10 @@ public abstract class PopupControlSet extends TaskEditControlSetBase {
     };
 
     public PopupControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int taskEditViewLayout, final int title) {
-        super(activity, viewLayout);
+        super(activity, viewLayout, false);
         this.preferences = preferences;
         if (taskEditViewLayout != -1) {
-            this.displayView = LayoutInflater.from(activity).inflate(taskEditViewLayout, null);
+            this.displayView = inflateWithTemplate(taskEditViewLayout);
         } else {
             this.displayView = null;
         }
@@ -63,6 +62,7 @@ public abstract class PopupControlSet extends TaskEditControlSetBase {
             displayView.setOnClickListener(getDisplayClickListener());
         }
     }
+
     @Override
     public View getView() {
         return displayView;

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

@@ -396,4 +396,9 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte
     @Override
     public void onNothingSelected(AdapterView<?> parent) {
     }
+
+    @Override
+    public int getIcon() {
+        return R.attr.ic_action_bell;
+    }
 }

src/main/res/layout/control_set_deadline.xml

@@ -3,41 +3,13 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/display_row_edit"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:layout_gravity="top"
-
+    android:gravity="start"
-    <ImageView
+    android:textColor="?attr/asThemeTextColor"
-        android:src="?attr/ic_action_clock"
+    android:textSize="@dimen/task_edit_text_size"
-        android:contentDescription="@string/TEA_deadline_hint"
+    android:paddingRight="@dimen/task_edit_padding_right"
-        android:layout_width="wrap_content"
+    android:paddingEnd="@dimen/task_edit_padding_right" />
-        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_description.xml

@@ -1,48 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
-** Copyright (c) 2012 Todoroo Inc
+<EditText xmlns:android="http://schemas.android.com/apk/res/android"
-**
+    style="@style/edit_text_style"
-** See the file "LICENSE" for the full license governing this code. 
+    android:id="@+id/notes"
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:paddingRight="@dimen/task_edit_padding_right"
-
+    android:paddingEnd="@dimen/task_edit_padding_right"
-    <ImageView
+    android:scrollbars="vertical"
-        android:src="?attr/ic_action_list"
+    android:hint="@string/TEA_notes_empty"
-        android:contentDescription="@string/TEA_note_label"
+    android:textColorHint="?attr/asTextColorHint"
-        android:layout_width="wrap_content"
+    android:textSize="@dimen/task_edit_text_size"
-        android:layout_height="wrap_content"
+    android:inputType="textCapSentences|textMultiLine"
-        android:layout_gravity="top"
+    android:imeOptions="flagNoExtractUi"
-        android:padding="@dimen/task_edit_drawable_padding" />
+    android:textColor="?attr/asTextColor"
-
+    android:freezesText="true"
-    <LinearLayout
+    android:background="@android:color/transparent" />
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <EditText
-            style="@style/edit_text_style"
-            android:id="@+id/notes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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"
-            android:scrollbars="vertical"
-            android:hint="@string/TEA_notes_empty"
-            android:textColorHint="?attr/asTextColorHint"
-            android:textSize="@dimen/task_edit_text_size"
-            android:inputType="textCapSentences|textMultiLine"
-            android:imeOptions="flagNoExtractUi"
-            android:textColor="?attr/asTextColor"
-            android:freezesText="true"
-            android:background="@android:color/transparent" />
-
-        <include layout="@layout/task_edit_divider" />
-
-    </LinearLayout>
-</LinearLayout>

src/main/res/layout/control_set_files.xml

@@ -4,37 +4,11 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/files_list"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="0dp"
-    android:orientation="horizontal">
+    android:layout_weight="1"
-
+    android:gravity="start"
-    <ImageView
+    android:orientation="vertical"
-        android:src="?attr/ic_action_attachment"
+    android:paddingRight="@dimen/task_edit_padding_right"
-        android:contentDescription="@string/TEA_control_files"
+    android:paddingEnd="@dimen/task_edit_padding_right" />
-        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">
-
-        <LinearLayout
-            android:id="@+id/files_list"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="start"
-            android:orientation="vertical"
-            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_files_dialog.xml

@@ -1,26 +1,24 @@
-<?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:orientation="vertical"
-  android:orientation="vertical"
+    android:layout_width="fill_parent"
-  android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
-  android:layout_height="fill_parent">
+
-  
+    <ScrollView
-  <!-- notes -->
+        android:layout_width="fill_parent"
-  <ScrollView
+        android:layout_height="0dp"
-      android:layout_width="fill_parent"
+        android:layout_weight="100">
-   	  android:layout_height="wrap_content"
+
-      android:layout_weight="100">
+        <LinearLayout
-	  <LinearLayout
+            android:id="@+id/files_list"
-	    android:id="@+id/files_list"
+            android:orientation="vertical"
-	    android:orientation="vertical"
+            android:layout_width="fill_parent"
-	    android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
-	    android:layout_height="wrap_content">
+    </ScrollView>
-	  </LinearLayout>
+
-  </ScrollView>
+    <include layout="@layout/control_dialog_ok" />
-  <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>

src/main/res/layout/control_set_gcal_display.xml

@@ -1,54 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?><!--
 ** Copyright (c) 2012 Todoroo Inc
 **
-** See the file "LICENSE" for the full license governing this code. 
+** See the file "LICENSE" for the full license governing this code.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <ImageView
+    <TextView
-        android:src="?attr/ic_action_calendar_month"
+        android:id="@+id/calendar_display_which"
-        android:contentDescription="@string/gcal_TEA_addToCalendar_label"
+        android:layout_width="match_parent"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:padding="@dimen/task_edit_drawable_padding" />
+        android:gravity="start"
+        android:textColor="?attr/asThemeTextColor"
+        android:textSize="@dimen/task_edit_text_size" />
 
-    <LinearLayout
+    <Spinner
-        android:layout_width="fill_parent"
+        android:id="@+id/calendars"
-        android:layout_height="wrap_content"
+        android:layout_width="0dip"
-        android:orientation="vertical">
+        android:layout_height="0dip" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            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">
-
-            <TextView
-                android:id="@+id/calendar_display_which"
-                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" />
-
-            <Spinner
-                android:id="@+id/calendars"
-                android:layout_width="0dip"
-                android:layout_height="0dip" />
-
-        </LinearLayout>
-
-        <include layout="@layout/task_edit_divider" />
-
-    </LinearLayout>
 
 </LinearLayout>
-

src/main/res/layout/control_set_hide.xml

@@ -4,49 +4,22 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <ImageView
+    <TextView
-        android:src="?attr/ic_action_box"
+        android:id="@+id/display_row_edit"
-        android:contentDescription="@string/TEA_hideUntil_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
+        android:gravity="start|center_vertical"
-        android:padding="@dimen/task_edit_drawable_padding" />
+        android:textColor="?attr/asTextColor"
+        android:textColorHint="?attr/asTextColorHint"
+        android:textSize="@dimen/task_edit_text_size" />
 
-    <LinearLayout
+    <Spinner
-        android:orientation="vertical"
+        android:id="@+id/hideUntil"
-        android:layout_width="fill_parent"
+        android:layout_width="0dip"
-        android:layout_height="wrap_content">
+        android:layout_height="0dip" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            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">
-
-            <TextView
-                android:id="@+id/display_row_edit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="start|center_vertical"
-                android:textColor="?attr/asTextColor"
-                android:textColorHint="?attr/asTextColorHint"
-                android:textSize="@dimen/task_edit_text_size" />
-
-            <Spinner
-                android:id="@+id/hideUntil"
-                android:layout_width="0dip"
-                android:layout_height="0dip" />
-
-        </LinearLayout>
-
-        <include layout="@layout/task_edit_divider" />
-
-    </LinearLayout>
 </LinearLayout>

src/main/res/layout/control_set_importance.xml

@@ -4,49 +4,21 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/importance_container"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:paddingRight="@dimen/task_edit_padding_right"
+    android:paddingEnd="@dimen/task_edit_padding_right">
 
-    <ImageView
+    <TextView
-        android:src="?attr/ic_action_flag"
+        android:id="@+id/display_row_edit"
-        android:contentDescription="@string/TEA_importance_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
+        android:gravity="start|center_vertical"
-        android:padding="@dimen/task_edit_drawable_padding" />
+        android:text="@string/TEA_importance_label"
-
+        android:textColor="?attr/asTextColor"
-    <LinearLayout
+        android:textSize="@dimen/task_edit_text_size" />
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/importance_container"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingRight="@dimen/task_edit_padding_right"
-            android:paddingEnd="@dimen/task_edit_padding_right">
-
-            <TextView
-                android:id="@+id/display_row_edit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
-                android:layout_marginBottom="@dimen/task_edit_padding_top_bottom"
-                android:paddingTop="@dimen/task_edit_padding_top_bottom"
-                android:paddingBottom="@dimen/task_edit_padding_top_bottom"
-                android:gravity="start|center_vertical"
-                android:text="@string/TEA_importance_label"
-                android:textColor="?attr/asTextColor"
-                android:textSize="@dimen/task_edit_text_size" />
-
-        </LinearLayout>
-
-        <include layout="@layout/task_edit_divider" />
-
-    </LinearLayout>
 
 </LinearLayout>

src/main/res/layout/control_set_reminders.xml

@@ -4,95 +4,68 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="vertical">
-
-    <ImageView
-        android:src="?attr/ic_action_bell"
-        android:contentDescription="@string/TEA_control_reminders"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:padding="@dimen/task_edit_drawable_padding" />
 
     <LinearLayout
+        android:id="@+id/alert_container"
         android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:orientation="horizontal"
-            android:paddingTop="@dimen/task_edit_padding_top_bottom"
+            android:layout_gravity="start"
-            android:paddingBottom="@dimen/task_edit_padding_top_bottom"
+            android:gravity="start"
-            android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
+            android:layout_weight="50">
-            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom">
+
-
+            <TextView
-            <LinearLayout
+                android:textSize="@dimen/task_edit_text_size"
-                android:id="@+id/alert_container"
+                android:id="@+id/alarms_add"
-                android:orientation="vertical"
+                android:layout_width="wrap_content"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:text="@string/add_reminder"
-
+                android:textColor="?attr/asTextColorHint" />
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_gravity="start"
-                    android:gravity="start"
-                    android:layout_weight="50">
-
-                    <TextView
-                        android:textSize="@dimen/task_edit_text_size"
-                        android:id="@+id/alarms_add"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/add_reminder"
-                        android:textColor="?attr/asTextColorHint" />
 
-                    <Spinner
+            <Spinner
-                        android:id="@+id/alarms_add_spinner"
+                android:id="@+id/alarms_add_spinner"
-                        android:layout_width="0dip"
+                android:layout_width="0dip"
-                        android:layout_height="0dip" />
+                android:layout_height="0dip" />
 
-                </LinearLayout>
+        </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_gravity="end"
-                    android:gravity="end"
-                    android:layout_weight="50">
-
-                    <TextView
-                        android:id="@+id/reminder_alarm_display"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/task_edit_text_size"
-                        android:paddingRight="10dip"
-                        android:paddingEnd="10dip"
-                        android:textColor="?attr/asTextColor" />
-
-                    <Spinner
-                        android:id="@+id/reminder_alarm"
-                        android:layout_width="0dip"
-                        android:layout_height="0dip" />
 
-                </LinearLayout>
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="end"
+            android:gravity="end"
+            android:layout_weight="50">
+
+            <TextView
+                android:id="@+id/reminder_alarm_display"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/task_edit_text_size"
+                android:paddingRight="10dip"
+                android:paddingEnd="10dip"
+                android:textColor="?attr/asTextColor" />
 
-            </LinearLayout>
+            <Spinner
+                android:id="@+id/reminder_alarm"
+                android:layout_width="0dip"
+                android:layout_height="0dip" />
 
         </LinearLayout>
 
-        <include layout="@layout/task_edit_divider" />
-
     </LinearLayout>
+
 </LinearLayout>

src/main/res/layout/control_set_repeat_display.xml

@@ -1,44 +1,15 @@
-<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/display_row_edit"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:layout_gravity="top"
-
+    android:gravity="start"
-    <ImageView
+    android:textColor="?attr/asThemeTextColor"
-        android:src="?attr/ic_action_reload"
+    android:textSize="@dimen/task_edit_text_size"
-        android:contentDescription="@string/repeat_until_title"
+    android:paddingRight="@dimen/task_edit_padding_right"
-        android:layout_width="wrap_content"
+    android:paddingEnd="@dimen/task_edit_padding_right" />
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:padding="@dimen/task_edit_drawable_padding" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <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_tags.xml

@@ -3,36 +3,10 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:id="@+id/display_row_edit"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:layout_gravity="top"
-
+    android:textColor="?attr/asThemeTextColor"
-    <ImageView
+    android:textSize="@dimen/task_edit_text_size" />
-        android:src="?attr/ic_action_tags"
-        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: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:id="@+id/display_row_edit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:textColor="?attr/asThemeTextColor"
-            android:textSize="@dimen/task_edit_text_size" />
-
-        <include layout="@layout/task_edit_divider" />
-
-    </LinearLayout>
-</LinearLayout>

src/main/res/layout/control_set_template.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:padding="@dimen/task_edit_drawable_padding" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/content"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            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" />
+
+        <include layout="@layout/task_edit_divider" />
+
+    </LinearLayout>
+
+</LinearLayout>

src/main/res/layout/control_set_timers.xml

@@ -3,36 +3,9 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/display_row_edit"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:textColor="?attr/asThemeTextColor"
-
+    android:textSize="@dimen/task_edit_text_size" />
-    <ImageView
-        android:src="?attr/ic_action_alarm"
-        android:contentDescription="@string/TEA_timer_controls"
-        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: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" />
-
-        <include layout="@layout/task_edit_divider" />
-
-    </LinearLayout>
-</LinearLayout>