From 6575f9a238c4c25707342cf9f281eb2dbfeda29a Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 2 Apr 2013 12:10:01 -0700
Subject: [PATCH] Adjusted some default layouts

---
 .../res/layout/control_set_default_display.xml |  5 +++--
 astrid/res/layout/control_set_importance.xml   |  4 ++--
 .../res/layout/control_set_notes_display.xml   | 18 ++++++------------
 astrid/res/values/strings-core.xml             |  3 +++
 .../todoroo/astrid/ui/EditNotesControlSet.java |  9 ++++++---
 5 files changed, 20 insertions(+), 19 deletions(-)

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">
         
          <View android:id="@+id/display_row_icon"
-             android:layout_width="25dip"
-             android:layout_height="25dip"
+             android:layout_marginRight="10dip"
+             android:layout_width="24dip"
+             android:layout_height="24dip"
              android:background="#ff0000"/>
 	     <TextView
 	         android:id="@+id/display_row_title"
diff --git a/astrid/res/layout/control_set_importance.xml b/astrid/res/layout/control_set_importance.xml
index b73be965c..db0f4e713 100644
--- a/astrid/res/layout/control_set_importance.xml
+++ b/astrid/res/layout/control_set_importance.xml
@@ -21,8 +21,8 @@
         android:paddingRight="10dip"
         android:layout_height="50dip">
 	      <View android:id="@+id/display_row_icon"
-             android:layout_width="25dip"
-             android:layout_height="25dip"
+             android:layout_width="24dip"
+             android:layout_height="24dip"
              android:background="#ff0000"/>
       </LinearLayout>
       
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" >
-
-        <TextView
-            android:id="@+id/display_row_title"
-            style="@style/TextAppearance.GEN_EditLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="4dip"
-            android:paddingBottom="4dip"
-            android:text="@string/TEA_note_label" />
-
+        <View android:id="@+id/display_row_icon"
+            android:layout_marginRight="10dip"
+            android:layout_width="24dip"
+            android:layout_height="24dip"
+            android:background="#ff0000"/>
         <TextView
             android:id="@+id/display_row_edit"
             style="@style/TextAppearance.EditRowDisplay"
             android:layout_width="fill_parent"
-            android:paddingBottom="10dip"
             android:layout_height="wrap_content"
             android:gravity="left" />
     </LinearLayout>
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 @@
   
   <!-- slide 16c: Task note label -->
   <string name="TEA_note_label">Description</string>
+
+  <!-- slide 16c: Task note label -->
+  <string name="TEA_notes_empty">Description...</string>
   
   <!-- Task note hint -->
   <string name="TEA_notes_hint">Enter task description...</string>
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();
     }