|
|
@ -287,13 +287,16 @@ public final class TaskEditActivity extends Activity {
|
|
|
|
GCalControlSet gcalControl = new GCalControlSet(TaskEditActivity.this,
|
|
|
|
GCalControlSet gcalControl = new GCalControlSet(TaskEditActivity.this,
|
|
|
|
R.layout.control_set_gcal, R.layout.control_set_gcal_display,
|
|
|
|
R.layout.control_set_gcal, R.layout.control_set_gcal_display,
|
|
|
|
R.string.gcal_TEA_addToCalendar_label);
|
|
|
|
R.string.gcal_TEA_addToCalendar_label);
|
|
|
|
controls.add(gcalControl);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//The deadline control set contains the repeat controls and the calendar controls.
|
|
|
|
|
|
|
|
//NOTE: we add the gcalControl to the list AFTER the deadline control, because
|
|
|
|
|
|
|
|
//otherwise the correct date may not be written to the calendar event. Order matters!
|
|
|
|
DeadlineControlSet deadlineControl = new DeadlineControlSet(
|
|
|
|
DeadlineControlSet deadlineControl = new DeadlineControlSet(
|
|
|
|
TaskEditActivity.this, R.layout.control_set_deadline,
|
|
|
|
TaskEditActivity.this, R.layout.control_set_deadline,
|
|
|
|
R.layout.control_set_deadline_display, repeatControls.getDisplayView(), gcalControl.getDisplayView());
|
|
|
|
R.layout.control_set_deadline_display, repeatControls.getDisplayView(), gcalControl.getDisplayView());
|
|
|
|
controls.add(deadlineControl);
|
|
|
|
controls.add(deadlineControl);
|
|
|
|
controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl);
|
|
|
|
controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl);
|
|
|
|
|
|
|
|
controls.add(gcalControl);
|
|
|
|
|
|
|
|
|
|
|
|
ImportanceControlSet importanceControl = new ImportanceControlSet(
|
|
|
|
ImportanceControlSet importanceControl = new ImportanceControlSet(
|
|
|
|
TaskEditActivity.this, R.layout.control_set_importance);
|
|
|
|
TaskEditActivity.this, R.layout.control_set_importance);
|
|
|
|