Merge "View inline images in photo viewer. b/5555553." into ub-mail-master
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index effce6c..7ddfd2c 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -260,4 +260,8 @@
<style name="MessageAttachmentBarMarginEndStyle">
<item name="android:layout_marginEnd">@dimen/message_attachment_bar_padding</item>
</style>
+
+ <style name="RecipientComposeHeading" parent="@style/AbstractRecipientComposeHeading">
+ <item name="android:layout_marginEnd">@dimen/compose_recipient_heading_margin_end</item>
+ </style>
</resources>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index a121313..c8d2d99 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -153,4 +153,6 @@
<dimen name="message_attachment_bar_padding">8dip</dimen>
+ <dimen name="compose_recipient_heading_margin_end">4dip</dimen>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 42047ab..f552e2c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,12 +58,15 @@
<item name="android:layout_gravity">center_vertical</item>
</style>
- <style name="RecipientComposeHeading" parent="@style/ComposeHeading">
- <item name="android:layout_marginRight">4dip</item>
+ <style name="AbstractRecipientComposeHeading" parent="@style/ComposeHeading">
<item name="android:layout_marginTop">4dip</item>
<item name="android:paddingLeft">0dip</item>
</style>
+ <style name="RecipientComposeHeading" parent="@style/AbstractRecipientComposeHeading">
+ <item name="android:layout_marginRight">@dimen/compose_recipient_heading_margin_end</item>
+ </style>
+
<style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
<item name="android:addStatesFromChildren">true</item>
<item name="android:focusable">false</item>
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index db4faef..48d78c5 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -401,8 +401,9 @@
mMessage = mMessageHeaderItem.getMessage();
- final boolean alwaysShowImages = (getAccount() != null) &&
- (getAccount().settings.showImages == Settings.ShowImages.ALWAYS);
+ final Account account = getAccount();
+ final boolean alwaysShowImages = (account != null) &&
+ (account.settings.showImages == Settings.ShowImages.ALWAYS);
mShowImagePrompt = mMessage.shouldShowImagePrompt() && !alwaysShowImages;
setExpanded(mMessageHeaderItem.isExpanded());
@@ -430,7 +431,7 @@
// the only possible fromAddress.
String from = mMessage.getFrom();
if (TextUtils.isEmpty(from)) {
- from = getAccount().name;
+ from = (account != null) ? account.name : "";
}
mSender = getAddress(from);
@@ -486,7 +487,9 @@
* on the message header and attempts to copy/send email.
*/
private void setAddressOnContextMenu() {
- mEmailCopyMenu.setAddress(mSender.getAddress());
+ if (mSender != null) {
+ mEmailCopyMenu.setAddress(mSender.getAddress());
+ }
}
@Override
@@ -556,6 +559,9 @@
* Return the name, if known, or just the address.
*/
private static CharSequence getSenderName(Address sender) {
+ if (sender == null) {
+ return "";
+ }
final String displayName = sender.getName();
return TextUtils.isEmpty(displayName) ? sender.getAddress() : displayName;
}
@@ -564,7 +570,7 @@
* Return the address, if a name is present, or null if not.
*/
private static CharSequence getSenderAddress(Address sender) {
- return sender.getAddress();
+ return (sender != null) ? sender.getAddress() : "";
}
private static void setChildVisibility(int visibility, View... children) {
