From 18fc2d23a347ae7185e526d73cfd5522f3d07eba Mon Sep 17 00:00:00 2001 From: Mindy Pereira Date: Tue, 13 Mar 2012 09:56:20 -0700 Subject: Use the correct text color for labels. Change-Id: If4665bd42c4ec55476cdbf02111105b792b61a05 --- src/com/android/mail/ui/FolderDisplayer.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/com/android/mail/ui/FolderDisplayer.java') diff --git a/src/com/android/mail/ui/FolderDisplayer.java b/src/com/android/mail/ui/FolderDisplayer.java index b2a03a2b1..3318af325 100644 --- a/src/com/android/mail/ui/FolderDisplayer.java +++ b/src/com/android/mail/ui/FolderDisplayer.java @@ -54,6 +54,8 @@ public class FolderDisplayer { public int textColor; + public boolean showBgColor; + public FolderValues(String id, String color, String n, String bgColor, String fgColor, Context context) { folderId = id; @@ -66,7 +68,12 @@ public class FolderDisplayer { backgroundColor = Utils.getDefaultFolderBackgroundColor(context); } // TODO(mindyp): add default fg text color and text color from preference. - textColor = Color.BLACK; + final boolean showTextColor = !TextUtils.isEmpty(fgColor); + if (showTextColor) { + textColor = Integer.parseInt(fgColor); + } else { + textColor = Utils.getDefaultFolderTextColor(context); + } } @Override @@ -101,7 +108,12 @@ public class FolderDisplayer { } for (Folder folder : folders) { String folderId = folder.id; + String canonicalName = folder.name; String colorId = folder.bgColor; + + // We will sometimes see folders that the folder map does not yet know about or that + // do not have names yet. + if (TextUtils.isEmpty(canonicalName)) continue; String stringToDisplay = null; if (!Folder.isProviderFolder(folder)) { -- cgit v1.2.3