From 1f0d01f8eaa86f1a8a44ae34af44a3ff4e203fba Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 18 Dec 2012 11:22:27 -0800
Subject: [PATCH] Copy update, fixed a text color bug

---
 astrid/res/layout/control_set_notes.xml                         | 1 +
 astrid/res/values/strings-core.xml                              | 2 +-
 .../com/todoroo/astrid/utility/AstridLitePreferenceSpec.java    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml
index b57db302d..12aaf21a2 100644
--- a/astrid/res/layout/control_set_notes.xml
+++ b/astrid/res/layout/control_set_notes.xml
@@ -44,6 +44,7 @@
 	      android:autoText="true"
 	      android:capitalize="sentences"
 	      android:singleLine="false"
+	      android:textColor="?attr/asTextColor"
 	      android:freezesText="true" />
 	  </LinearLayout>
   </ScrollView>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index e1f973fde..bd93a7bce 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -108,7 +108,7 @@
   <string name="TLA_menu_addons">Add-ons</string>
   
   <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort &amp; Subtasks</string>
+  <string name="TLA_menu_sort">Sort</string>
   
   <!-- Menu: Sync Now -->    
   <string name="TLA_menu_sync">Sync Now</string>
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index 70d6a487e..ac4a05ef5 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -116,7 +116,7 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_show_menu_friends, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_featured_lists, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sync, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_menu_sort, false, ifUnset);
+        setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_addons, false, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_quickadd_controls, false, ifUnset);