Merge "Don't use a custom color for senders in notifications" into jb-ub-mail-ur8
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6517d94..5e8b86a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -246,7 +246,7 @@
<string name="cc_heading" msgid="8116221732072085180">"Cc:"</string>
<string name="bcc_heading" msgid="5528824453033598299">"Bcc:"</string>
<string name="show_images" msgid="1875700481186331432">"Afbeeldingen weergeven"</string>
- <string name="always_show_images" msgid="5966408990164581801">"Foto\'s van deze afzender altijd tonen"</string>
+ <string name="always_show_images" msgid="5966408990164581801">"Afbeeldingen van deze afzender altijd tonen"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Foto\'s van deze afzender worden automatisch weergegeven."</string>
<string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
<string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
diff --git a/src/com/android/mail/ui/EllipsizedMultilineTextView.java b/src/com/android/mail/ui/EllipsizedMultilineTextView.java
index 9d2746d..0f83f27 100644
--- a/src/com/android/mail/ui/EllipsizedMultilineTextView.java
+++ b/src/com/android/mail/ui/EllipsizedMultilineTextView.java
@@ -100,8 +100,8 @@
}
builder.append(text, 0, layout.getLineStart(mMaxLines - 1));
- if (!TextUtils.isEmpty(remainder) && remainder.length() > 1) {
- builder.append(remainder, 0, remainder.length() - 1);
+ if (!TextUtils.isEmpty(remainder)) {
+ builder.append(remainder);
}
setText(builder, TextView.BufferType.SPANNABLE);
}