diff --git a/astrid/res/layout/control_set_default_display.xml b/astrid/res/layout/control_set_default_display.xml
index 1083ea182..9e85ab572 100644
--- a/astrid/res/layout/control_set_default_display.xml
+++ b/astrid/res/layout/control_set_default_display.xml
@@ -19,8 +19,9 @@
android:gravity="center_vertical">
diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/res/layout/control_set_notes_display.xml
index c0d93f09e..96e84a8b1 100644
--- a/astrid/res/layout/control_set_notes_display.xml
+++ b/astrid/res/layout/control_set_notes_display.xml
@@ -17,24 +17,18 @@
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:minHeight="50dip"
- android:orientation="vertical"
+ android:orientation="horizontal"
android:paddingLeft="10dip"
android:paddingRight="10dip" >
-
-
-
+
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 7e68c6076..1a94f473d 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -340,6 +340,9 @@
Description
+
+
+ Description...
Enter task description...
diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
index 97f37ab14..75bdc3237 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
@@ -10,7 +10,6 @@ import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.text.util.Linkify;
-import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
@@ -36,8 +35,12 @@ public class EditNotesControlSet extends PopupControlSet {
else
textToUse = model.getValue(Task.NOTES);
- notesPreview.setText(textToUse);
- notesPreview.setVisibility(TextUtils.isEmpty(textToUse) ? View.GONE : View.VISIBLE);
+ if (TextUtils.isEmpty(textToUse)) {
+ notesPreview.setText(R.string.TEA_notes_empty);
+ } else {
+ notesPreview.setText(textToUse);
+ }
+
linkifyDisplayView();
}