Hide year in quickadd date picker

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDeadlineControlSet.java

@@ -46,7 +46,7 @@ public class TaskRabbitDeadlineControlSet extends PopupControlSet implements Tas
     @Override
     protected void refreshDisplayView() {
         TextView dateDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        String toDisplay = dateAndTimePicker.getDisplayString(activity, false);
+        String toDisplay = dateAndTimePicker.getDisplayString(activity, false, false);
         if (dateDisplay != null)
             dateDisplay.setText(toDisplay);
     }

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

@@ -650,7 +650,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
                 getActivity(), R.layout.control_set_deadline,
                 R.layout.control_set_default_display,
                 repeatControl.getDisplayView(), gcalControl.getDisplayView());
-        deadlineControl.setUseNewlineForDisplaySeparator(true);
+        deadlineControl.setIsQuickadd(true);
 
         peopleControl = new EditPeopleControlSet(getActivity(), this,
                 R.layout.control_set_assigned,

astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java

@@ -93,10 +93,10 @@ public class DateAndTimeDialog extends Dialog {
     }
 
     public String getDisplayString(Context context) {
-        return dateAndTimePicker.getDisplayString(context, false);
+        return dateAndTimePicker.getDisplayString(context, false, false);
     }
 
     public String getDisplayString(Context context, long forDate) {
-        return DateAndTimePicker.getDisplayString(context, forDate, false);
+        return DateAndTimePicker.getDisplayString(context, forDate, false, false);
     }
 }

astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java

@@ -223,16 +223,19 @@ public class DateAndTimePicker extends LinearLayout {
         this.listener = listener;
     }
 
-    public String getDisplayString(Context context, boolean useNewline) {
+    public String getDisplayString(Context context, boolean useNewline, boolean hideYear) {
         long dueDate = constructDueDate();
-        return getDisplayString(context, dueDate, useNewline);
+        return getDisplayString(context, dueDate, useNewline, hideYear);
     }
 
-    public static String getDisplayString(Context context, long forDate, boolean useNewline) {
+    public static String getDisplayString(Context context, long forDate, boolean useNewline, boolean hideYear) {
         StringBuilder displayString = new StringBuilder();
         Date d = new Date(forDate);
         if (d.getTime() > 0) {
-            displayString.append(DateUtilities.getDateString(context, d));
+            if (hideYear)
+                displayString.append(DateUtilities.getDateStringHideYear(context, d));
+            else
+                displayString.append(DateUtilities.getDateString(context, d));
             if (Task.hasDueTime(forDate)) {
                 displayString.append(useNewline ? "\n" : ", "); //$NON-NLS-1$ //$NON-NLS-2$
                 displayString.append(DateUtilities.getTimeString(context, d));

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

@@ -15,7 +15,7 @@ import com.todoroo.astrid.data.Task;
 
 public class DeadlineControlSet extends PopupControlSet {
 
-    private boolean useNewline = false;
+    private boolean isQuickadd = false;
     private final DateAndTimePicker dateAndTimePicker;
 
     public DeadlineControlSet(Activity activity, int viewLayout, int displayViewLayout, View...extraViews) {
@@ -44,7 +44,7 @@ public class DeadlineControlSet extends PopupControlSet {
     @Override
     protected void refreshDisplayView() {
         TextView dateDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        String toDisplay = dateAndTimePicker.getDisplayString(activity, useNewline);
+        String toDisplay = dateAndTimePicker.getDisplayString(activity, isQuickadd, isQuickadd);
         dateDisplay.setText(toDisplay);
     }
 
@@ -74,7 +74,7 @@ public class DeadlineControlSet extends PopupControlSet {
      * Set whether date and time should be separated by a newline or a comma
      * in the display view
      */
-    public void setUseNewlineForDisplaySeparator(boolean useNewline) {
-        this.useNewline = useNewline;
+    public void setIsQuickadd(boolean isQuickadd) {
+        this.isQuickadd = isQuickadd;
     }
 }

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

@@ -249,7 +249,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
         task.setValue(Task.HIDE_UNTIL, value);
 
         if (value != 0)
-            return activity.getString(R.string.TEA_hideUntil_message, DateAndTimePicker.getDisplayString(activity, value, false));
+            return activity.getString(R.string.TEA_hideUntil_message, DateAndTimePicker.getDisplayString(activity, value, false, false));
         return null;
     }