From d0d6eb544231af5d5926796b980c14bb1932ae5e Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Mon, 20 Apr 2009 00:58:50 +0000
Subject: [PATCH] Set the landscape-mode text colors to something more
 reasonable (and really "default") in the landscape xml layout templates
 Re-remove the explicit subject color hardcoding in FolderMessageList.java

---
 AndroidManifest.xml                                   | 4 ++--
 res/layout-land/folder_message_list_child.xml         | 6 +++---
 src/com/android/email/activity/FolderMessageList.java | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6dda45d30..5b9bfe11d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="105"
-    android:versionName="0.105" package="com.fsck.k9">
+    android:versionCode="106"
+    android:versionName="0.106" package="com.fsck.k9">
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
diff --git a/res/layout-land/folder_message_list_child.xml b/res/layout-land/folder_message_list_child.xml
index 76532a172..3fcf06901 100644
--- a/res/layout-land/folder_message_list_child.xml
+++ b/res/layout-land/folder_message_list_child.xml
@@ -18,7 +18,7 @@
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="?android:attr/textColorPrimary"
         android:layout_width="50px"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true" />
@@ -29,7 +29,7 @@
         android:layout_width="110px"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondaryInverse"
+        android:textColor="?android:attr/textColorSecondary"
         android:paddingLeft="3px"
         android:paddingRight="3px"
         android:layout_toLeftOf="@+id/date" />
@@ -38,7 +38,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="?android:attr/textColorPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="10px"
diff --git a/src/com/android/email/activity/FolderMessageList.java b/src/com/android/email/activity/FolderMessageList.java
index 06bd30ebf..efcad1253 100644
--- a/src/com/android/email/activity/FolderMessageList.java
+++ b/src/com/android/email/activity/FolderMessageList.java
@@ -2199,10 +2199,6 @@ public class FolderMessageList extends ExpandableListActivity
                 {
                   holder.subject.setTextColor(Email.FLAGGED_COLOR);
                 }
-                else
-                {
-                  holder.subject.setTextColor(0xff000000);
-                }
 
                 holder.subject.setText(message.subject);