Merge "Align web view content with sender image." into jb-ub-mail-ur10
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 517021b..3e316bc 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -23,9 +23,9 @@
<dimen name="conversation_header_vertical_padding">26dip</dimen>
<dimen name="conversation_header_vertical_padding_condensed">26dip</dimen>
<dimen name="conversation_header_side_padding">24dip</dimen>
+ <dimen name="conversation_message_content_margin_side">24dp</dimen>
<dimen name="conversation_page_gutter">0dip</dimen>
<dimen name="message_border_height">16dp</dimen>
- <dimen name="message_header_padding_start">24dp</dimen>
<dimen name="message_header_inner_side_padding">16dp</dimen>
<dimen name="message_header_contact_photo_width">64dp</dimen>
<dimen name="message_header_contact_photo_height">64dp</dimen>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 2da5f0a..4ee765a 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -34,7 +34,7 @@
<dimen name="folder_cell_width">32dip</dimen>
<dimen name="folders_left_padding">8dip</dimen>
<dimen name="conversation_page_gutter">16dp</dimen>
- <dimen name="conversation_message_content_margin_side">16dp</dimen>
+ <dimen name="conversation_message_content_margin_side">10dp</dimen>
<dimen name="conversation_view_margin_side">8dp</dimen>
<dimen name="conversation_view_margin_side_minus_gradient">7dp</dimen>
<dimen name="conversation_header_margin_side">0dp</dimen>
@@ -57,7 +57,8 @@
<dimen name="message_header_presence_top_margin">-4dp</dimen>
<dimen name="message_header_action_button_width">48dp</dimen>
<dimen name="message_header_action_button_height">48dp</dimen>
- <dimen name="message_header_padding_start">10dp</dimen>
+ <dimen name="message_header_padding_start">
+ @dimen/conversation_message_content_margin_side</dimen>
<dimen name="message_header_title_container_margin_end_collapsed">10dp</dimen>
<dimen name="message_sender_name_text_size">16sp</dimen>
<dimen name="message_header_subtitle_text_size">12sp</dimen>
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index e8cd3c1..ce75478 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -271,10 +271,10 @@
final MessageHeaderView snapHeader = mConversationContainer.getSnapHeader();
initHeaderView(snapHeader);
- mMaxAutoLoadMessages = getResources().getInteger(R.integer.max_auto_load_messages);
+ final Resources resources = getResources();
+ mMaxAutoLoadMessages = resources.getInteger(R.integer.max_auto_load_messages);
- mSideMarginPx = getResources().getDimensionPixelOffset(
- R.dimen.conversation_view_margin_side) + getResources().getDimensionPixelOffset(
+ mSideMarginPx = resources.getDimensionPixelOffset(
R.dimen.conversation_message_content_margin_side);
mWebView.setOnCreateContextMenuListener(new WebViewContextMenu(getActivity()));
diff --git a/src/com/android/mail/ui/SecureConversationViewController.java b/src/com/android/mail/ui/SecureConversationViewController.java
index 9b6565c..7bd9254 100644
--- a/src/com/android/mail/ui/SecureConversationViewController.java
+++ b/src/com/android/mail/ui/SecureConversationViewController.java
@@ -134,9 +134,8 @@
mProgressController.showLoadingStatus(mCallbacks.isViewVisibleToUser());
final Resources r = mCallbacks.getFragment().getResources();
- mSideMarginInWebPx = (int) ((r.getDimensionPixelOffset(
- R.dimen.conversation_view_margin_side) + r.getDimensionPixelOffset(
- R.dimen.conversation_message_content_margin_side)) / r.getDisplayMetrics().density);
+ mSideMarginInWebPx = (int) (r.getDimensionPixelOffset(
+ R.dimen.conversation_message_content_margin_side) / r.getDisplayMetrics().density);
}
/**