commit 20d653208a522831d6732c76f92af53a01a7842c
author Alice Yang <alice@google.com> Thu Apr 25 21:31:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 25 21:31:46 2013 -0700
tree 7e1a4d9d575486304ccf1eff56f59152b4ce8f89
parent cc2d9425090a0edf1605a64bf96e0cbe906f6dca
parent a5f784bb99d719aafbb9944a708cc3b3324117cb

am a5f784bb: am 81c1b3ee: Sender images in email

* commit 'a5f784bb99d719aafbb9944a708cc3b3324117cb':
  Sender images in email

src/com/android/email/provider/EmailProvider.java

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index bcbc485..07358c4 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2653,7 +2653,7 @@
 
     private static int convListIconToUiValue(String convListIcon) {
         if (Preferences.CONV_LIST_ICON_CHECKBOX.equals(convListIcon)) {
-            return UIProvider.ConversationListIcon.CHECKBOX;
+            return UIProvider.ConversationListIcon.SENDER_IMAGE;
         } else if (Preferences.CONV_LIST_ICON_SENDER_IMAGE.equals(convListIcon)) {
             return UIProvider.ConversationListIcon.SENDER_IMAGE;
         } else if (Preferences.CONV_LIST_ICON_NONE.equals(convListIcon)) {