commit 5e28eef439fce8ac57c4f7fc97ce8f5aa2ca5469
author Scott Kennedy <skennedy@google.com> Sat Apr 27 01:40:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 27 01:40:15 2013 +0000
tree 28118e8e70a84bf36ffcd897927d4e7dead244a2
parent 51157a87fb9fe5e407ec480cd2ac3bfb244d86b5
parent fb4cb3873562856f39fe9e90aa97abaa676aef72

Merge "Perfect "Move to" icon :)" into jb-ub-mail-ur9

res/values/colors.xml

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 339fcb9..a80d96f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,15 +17,16 @@
 -->
 <resources>
     <color name="gray_text_color">#777777</color>
+    <color name="dark_gray_text_color">#58585b</color>
     <!-- Conversation List Item Colors -->
     <color name="default_text_color">#ff000000</color>
-    <color name="subject_text_color_unread">#58585b</color>
+    <color name="subject_text_color_unread">@color/dark_gray_text_color</color>
     <color name="snippet_text_color_unread">#777777</color>
-    <color name="senders_text_color_unread">@color/subject_text_color_unread</color>
+    <color name="senders_text_color_unread">@color/dark_gray_text_color</color>
     <color name="subject_text_color_read">@color/subject_text_color_unread</color>
     <color name="snippet_text_color_read">@color/snippet_text_color_unread</color>
     <color name="senders_text_color_read">@color/senders_text_color_unread</color>
-    <color name="date_text_color">@color/subject_text_color_unread</color>
+    <color name="date_text_color">@color/dark_gray_text_color</color>
     <color name="message_info_text_color">@color/gray_text_color</color>
     <color name="subject_text_color">#333333</color>
     <color name="drafts">#ff990000</color>
@@ -41,12 +42,11 @@
     <!-- Folder List/Drawer colors -->
     <color name="drawer_background_dim">#66000000</color>
     <color name="folder_list_divider_color">@color/gray_text_color</color>
-    <color name="folder_list_heading_text_color">@color/gray_text_color</color>
-    <color name="account_item_heading_text_color">@color/gray_text_color</color>
+    <color name="folder_list_heading_text_color">@color/dark_gray_text_color</color>
+    <color name="account_item_text_color">@color/dark_gray_text_color</color>
     <color name="account_item_selected_text_color">#35b4e3</color>
-    <color name="account_item_heading_background">@color/gray_text_color</color>
     <color name="list_background_color">#eeeeee</color>
-    <color name="folder_item_text_color">@color/gray_text_color</color>
+    <color name="folder_item_text_color">@color/dark_gray_text_color</color>
     <color name="folder_item_selected_text_color">@android:color/white</color>
     <color name="unread_count_color">#aaaaaa</color>
 

src/com/android/mail/ui/AccountItemView.java

diff --git a/src/com/android/mail/ui/AccountItemView.java b/src/com/android/mail/ui/AccountItemView.java
index 46482fc..801f0bb 100644
--- a/src/com/android/mail/ui/AccountItemView.java
+++ b/src/com/android/mail/ui/AccountItemView.java
@@ -74,7 +74,7 @@
             textColorResId = R.color.account_item_selected_text_color;
             buttonResId = R.drawable.ic_radiobutton_selected;
         } else {
-            textColorResId = R.color.gray_text_color;
+            textColorResId = R.color.account_item_text_color;
             buttonResId = R.drawable.ic_radiobutton;
         }
         mAccountTextView.setText(account.name);

src/com/android/mail/ui/FolderItemView.java

diff --git a/src/com/android/mail/ui/FolderItemView.java b/src/com/android/mail/ui/FolderItemView.java
index 737fe09..d40ef5c 100644
--- a/src/com/android/mail/ui/FolderItemView.java
+++ b/src/com/android/mail/ui/FolderItemView.java
@@ -178,7 +178,7 @@
         if (mIsSelected) {
             textColorResId = R.color.folder_item_selected_text_color;
         } else {
-            textColorResId = R.color.gray_text_color;
+            textColorResId = R.color.folder_item_text_color;
         }
         mFolderTextView.setTextColor(getContext().getResources().getColor(textColorResId));
         mUnreadCountTextView.setTextColor(getContext().getResources().getColor(textColorResId));