diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java
index 7627989d6..bfa9e4a73 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java
@@ -8,8 +8,6 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import com.timsu.astrid.R;
-import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.data.Task;
@@ -47,19 +45,7 @@ public class NoteDetailExposer extends BroadcastReceiver {
Task task = PluginServices.getTaskService().fetchById(id, Task.NOTES);
if(task == null)
return null;
- String notes = task.getValue(Task.NOTES);
- if(notes.length() == 0)
- return null;
-
- if(Preferences.getBoolean(R.string.p_showNotes, false)) {
- if(extended)
- return null;
- } else {
- if(!extended)
- return ""; //$NON-NLS-1$
- }
-
- return " " + notes; //$NON-NLS-1$
+ return null;
}
}
diff --git a/astrid/res/drawable/tango_share.png b/astrid/res/drawable/tango_share.png
index c55434e97..9b68ac33b 100644
Binary files a/astrid/res/drawable/tango_share.png and b/astrid/res/drawable/tango_share.png differ
diff --git a/astrid/res/layout/note_decoration.xml b/astrid/res/layout/note_decoration.xml
index d19848dae..9582450f4 100644
--- a/astrid/res/layout/note_decoration.xml
+++ b/astrid/res/layout/note_decoration.xml
@@ -12,7 +12,7 @@
android:layout_weight="5"
android:gravity="center_horizontal"
android:scaleType="center"
- android:src="@drawable/tango_notes" />
+ android:src="@drawable/silk_note" />
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 7f4dfbc17..24f653875 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -94,6 +94,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
Task.DETAILS,
Task.ELAPSED_SECONDS,
Task.TIMER_START,
+ Task.NOTES
};
private static int[] IMPORTANCE_COLORS = null;
@@ -664,7 +665,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
TaskDecoration deco = exposer.expose(viewHolder.task);
if(deco != null) {
addNew(viewHolder.task.getId(), exposer.getAddon(), deco);
- System.err.println("new chilli - " + exposer.getAddon());
}
}
@@ -698,8 +698,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
viewHolder.taskRow.addView(view, 2);
break;
case TaskDecoration.POSITION_RIGHT:
- System.err.println("addin da child");
- viewHolder.taskRow.addView(view, viewHolder.taskRow.getChildCount() - 1);
+ viewHolder.taskRow.addView(view, viewHolder.taskRow.getChildCount());
}
}
i++;
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index e010e90b3..50fc57312 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -11,8 +11,8 @@ import android.app.AlertDialog;
import android.app.PendingIntent;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -166,8 +166,7 @@ public class StartupService {
private void addIntroTask(Resources r, int summary, int note) {
Task task = new Task();
task.setValue(Task.TITLE, r.getString(summary));
- task.setValue(Task.DETAILS, " | " + //$NON-NLS-1$
- r.getString(R.string.intro_click_prompt));
+ task.setValue(Task.DETAILS, r.getString(R.string.intro_click_prompt));
task.setValue(Task.DETAILS_DATE, 2*DateUtilities.now());
task.setValue(Task.NOTES, r.getString(note));
taskService.save(task);