Merge "tablet visual tweaks. more caret." into jb-ub-mail-ur9
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 82b46df..8754154 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -868,6 +868,11 @@
<!-- Preference description swiping in conversation list option [CHAR LIMIT=100] -->
<string name="preference_swipe_description">In conversation list</string>
+ <!-- Preference name for whether to display sender images in conversation list [CHAR LIMIT=100] -->
+ <string name="preference_sender_image_title">Sender image</string>
+ <!-- Preference description for whether to display sender image option [CHAR LIMIT=200] -->
+ <string name="preference_sender_image_description">Show beside name in conversation list</string>
+
<!-- In conversation list, when user initiates a downward swipe,
this text is displayed in the action bar as a hint that they can trigger a
sync/refresh by continuing the downward swipe. [CHAR LIMIT=60] -->
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 878bfd4..f3ca8be 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -482,9 +482,9 @@
public static final String REPLY_BEHAVIOR = "reply_behavior";
/**
- * Integer column containing the user's preference for whether to show checkboxes or
- * or sender images (or neither) in the conversation list view. This value will be one
- * of the values in {@link UIProvider.ConversationListIcon}.
+ * Integer column containing the user's preference for whether to show sender images
+ * or not in the conversation list view. This value will be one of the values in
+ * {@link UIProvider.ConversationListIcon}.
*/
public static final String CONV_LIST_ICON = "conversation_list_icon";