am 66c8410c: am d28d8306: am 62efca0f: am 71ca610e: Merge "Ad icon is misplaced in RTL format" into ub-gmail-ur14-dev
* commit '66c8410cef24e2efb1bc51640e3cff3796f4dc73':
Ad icon is misplaced in RTL format
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index afb55cc..200dce1 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -867,11 +867,11 @@
private void createSubject(final boolean isUnread) {
final String badgeText = mHeader.badgeText == null ? "" : mHeader.badgeText;
String subject = filterTag(getContext(), mHeader.conversation.subject);
+ subject = mAdapter.getBidiFormatter().unicodeWrap(subject);
subject = Conversation.getSubjectForDisplay(mContext, badgeText, subject);
final Spannable displayedStringBuilder = new SpannableString(subject);
- // since spans affect text metrics, add spans to the string before measure/layout or fancy
- // ellipsizing
+ // since spans affect text metrics, add spans to the string before measure/layout or eliding
final int badgeTextLength = formatBadgeText(displayedStringBuilder, badgeText);