From ae0f20e1920f605e955dde49ee1ce01d01483ad6 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Thu, 19 Aug 2010 13:29:00 -0700
Subject: [PATCH] Remoted a temporary property on ProducteevLoginActivity,
 change 'Notes' -> 'Add a Comment' in taskedit with producteev

---
 astrid/AndroidManifest.xml                                  | 6 +-----
 astrid/res/layout/task_edit_activity.xml                    | 4 ++--
 astrid/res/values/strings-producteev.xml                    | 3 +++
 .../src/com/todoroo/astrid/activity/TaskEditActivity.java   | 3 +++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 452ff2be2..d1d28d495 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -337,11 +337,7 @@
       </intent-filter>
     </activity>
     <activity android:name="com.todoroo.astrid.producteev.ProducteevLoginActivity"
-              android:theme="@style/Theme">
-      <intent-filter> <!-- temporary -->   
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
+              android:theme="@style/Theme" />
     <service android:name="com.todoroo.astrid.producteev.ProducteevBackgroundService"/>
     <receiver android:name="com.todoroo.astrid.producteev.ProducteevStartupReceiver">
       <intent-filter>
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 5691e1d23..54c4f24f7 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -81,8 +81,8 @@
         android:background="@android:drawable/divider_horizontal_dark" />
               
       <!-- notes -->
-      <TextView
-        android:paddingTop="5dip"
+      <TextView android:id="@+id/notes_label"
+        android:paddingTop="5dip" 
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/TEA_note_label"
diff --git a/astrid/res/values/strings-producteev.xml b/astrid/res/values/strings-producteev.xml
index f45b56c79..02288955e 100644
--- a/astrid/res/values/strings-producteev.xml
+++ b/astrid/res/values/strings-producteev.xml
@@ -18,6 +18,9 @@
     
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="producteev_PDE_task_from">from %s</string>
+    
+    <!-- replacement string for task edit "Notes" when using Producteev -->
+    <string name="producteev_TEA_notes">Add a Comment</string>
 
     <!-- ==================================================== Preferences == -->
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index f52d5020b..97e17d0e4 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -58,6 +58,7 @@ import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.Spinner;
 import android.widget.TabHost;
+import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
@@ -253,6 +254,8 @@ public final class TaskEditActivity extends TabActivity {
             AddOn producteevAddon = addOnService.getAddOn(AddOnService.PRODUCTEEV_PACKAGE, "Producteev"); //$NON-NLS-1$
             if (addOnService.isInstalled(producteevAddon) && ProducteevUtilities.INSTANCE.isLoggedIn()) {
                 controls.add(new ProducteevControlSet(this, addonsAddons));
+                ((TextView)findViewById(R.id.notes)).setHint(R.string.producteev_TEA_notes);
+                ((TextView)findViewById(R.id.notes_label)).setHint(R.string.producteev_TEA_notes);
             }
         } catch (Exception e) {
             Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$