Merge "Turn ActionBar view recycling on" into jb-ub-mail
diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml
index b8b6ace..07faa2f 100644
--- a/res/layout/conversation_message_footer.xml
+++ b/res/layout/conversation_message_footer.xml
@@ -26,18 +26,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/attachments_header"
- android:textColor="@android:color/holo_blue_light"
android:textAllCaps="true"
android:visibility="gone"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"/>
+ android:paddingLeft="@dimen/message_details_header_padding_left"
+ style="@style/MessageAttachmentsHeaderStyle"/>
<View
android:id="@+id/attachments_header_bar"
android:layout_width="match_parent"
- android:layout_height="2dip"
- android:layout_marginBottom="2dip"
- android:background="@android:color/holo_blue_light"
- android:visibility="gone"/>
+ android:layout_height="@dimen/message_details_header_bottom_border_height"
+ android:visibility="gone"
+ android:background="@color/conv_subject_border"
+ android:layout_marginBottom="8dp" />
<com.android.mail.ui.AttachmentTileGrid
android:id="@+id/attachment_tile_grid"
android:layout_width="match_parent"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 64c685f..406059b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -189,7 +189,7 @@
<style name="ConversationListFade" parent="@android:style/Widget.Holo.Light.ListView">
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:divider">@android:color/transparent</item>
- <item name="android:dividerHeight">1dip</item>
+ <item name="android:dividerHeight">0dip</item>
</style>
<style name="StarStyle">
@@ -270,6 +270,10 @@
<item name="android:textSize">12sp</item>
</style>
+ <style name="MessageAttachmentsHeaderStyle" parent="MessageHeaderExtraSmallStyle">
+ <item name="android:textStyle">bold</item>
+ </style>
+
<style name="MessageHeaderDateTextStyle" parent="MessageHeaderSmallStyle">
<item name="android:layout_marginRight">@dimen/message_details_header_date_margin_right</item>
</style>
diff --git a/src/com/android/mail/browse/ConversationPagerAdapter.java b/src/com/android/mail/browse/ConversationPagerAdapter.java
index 82d2dec..d6092e7 100644
--- a/src/com/android/mail/browse/ConversationPagerAdapter.java
+++ b/src/com/android/mail/browse/ConversationPagerAdapter.java
@@ -254,8 +254,12 @@
public int getConversationPosition(Conversation conv) {
if (isSingletonMode()) {
+ if (getCursor() == null) {
+ return POSITION_NONE;
+ }
+
if (conv != mInitialConversation) {
- LogUtils.wtf(LOG_TAG, "unable to find conversation with null pager cursor. c=%s",
+ LogUtils.w(LOG_TAG, "unable to find conversation in singleton mode. c=%s",
conv);
return POSITION_NONE;
}