commit 069697b0567502d9314de10ea94240135e1154bc
author Mindy Pereira <mindyp@google.com> Mon Apr 02 13:27:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 02 13:27:05 2012 -0700
tree 69e8b133ec96af9c98b5ab2e4c7f7b494fb67687
parent 93a009c6964ef637b0784be41e2e28b974380429
parent 866d319dd23ec8b7b7d5476c65f7f83469d55d2d

Merge "Re-enable swipe."

src/com/android/mail/providers/Folder.java

diff --git a/src/com/android/mail/providers/Folder.java b/src/com/android/mail/providers/Folder.java
index 2a5d70a..605df3a 100644
--- a/src/com/android/mail/providers/Folder.java
+++ b/src/com/android/mail/providers/Folder.java
@@ -17,21 +17,22 @@
 
 package com.android.mail.providers;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 import android.content.Context;
 import android.content.CursorLoader;
 import android.database.Cursor;
+import android.graphics.Color;
 import android.graphics.drawable.PaintDrawable;
 import android.net.Uri;
 import android.net.Uri.Builder;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.Parcelable.Creator;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.android.mail.utils.LogUtils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -439,9 +440,10 @@
     // swatch (see bug 2431925).
     public static void setFolderBlockColor(Folder folder, View colorBlock) {
         final boolean showBg = !TextUtils.isEmpty(folder.bgColor);
-        final int backgroundColor = showBg ? Integer.parseInt(folder.bgColor) : 0;
-
-        if (!showBg) {
+        final int backgroundColor = showBg ? Color.parseColor(folder.bgColor) : 0;
+        if (folder.iconResId >= 0) {
+            colorBlock.setBackgroundResource((int)folder.iconResId);
+        } else if (!showBg) {
             colorBlock.setBackgroundDrawable(null);
         } else {
             PaintDrawable paintDrawable = new PaintDrawable();