diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-03-21 17:11:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-21 17:11:29 +0000 |
| commit | b792404a80bd6c7d3abcb1aab3dc66dbfce28f5b (patch) | |
| tree | 663a4c095a1cfe25ba39c4cf48f9550cdccf1e52 /src | |
| parent | 640741df0eafe1cd8f69638d508fa331365c4e96 (diff) | |
| parent | a6e29eca5965025f2f788929834c01cc345d7670 (diff) | |
| download | android_packages_apps_UnifiedEmail-b792404a80bd6c7d3abcb1aab3dc66dbfce28f5b.tar.gz android_packages_apps_UnifiedEmail-b792404a80bd6c7d3abcb1aab3dc66dbfce28f5b.tar.bz2 android_packages_apps_UnifiedEmail-b792404a80bd6c7d3abcb1aab3dc66dbfce28f5b.zip | |
Merge "RTL - use enumeration comma for lists." into ub-mail-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/print/PrintUtils.java | 2 | ||||
| -rw-r--r-- | src/com/android/mail/ui/NestedFolderTeaserView.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/mail/print/PrintUtils.java b/src/com/android/mail/print/PrintUtils.java index 78fd34320..30d11ce0a 100644 --- a/src/com/android/mail/print/PrintUtils.java +++ b/src/com/android/mail/print/PrintUtils.java @@ -240,7 +240,7 @@ public class PrintUtils { } } - return TextUtils.join(", ", formattedEmails); + return TextUtils.join(resources.getString(R.string.enumeration_comma), formattedEmails); } /** diff --git a/src/com/android/mail/ui/NestedFolderTeaserView.java b/src/com/android/mail/ui/NestedFolderTeaserView.java index 81dd481e8..31542d789 100644 --- a/src/com/android/mail/ui/NestedFolderTeaserView.java +++ b/src/com/android/mail/ui/NestedFolderTeaserView.java @@ -24,6 +24,7 @@ import android.content.res.Resources; import android.graphics.Color; import android.net.Uri; import android.os.Bundle; +import android.support.v4.text.BidiFormatter; import android.support.v4.util.SparseArrayCompat; import android.text.TextUtils; import android.util.AttributeSet; @@ -364,7 +365,9 @@ public class NestedFolderTeaserView extends LinearLayout implements Conversation final String unreadText = Utils.getUnreadCountString(getContext(), folder.unreadCount); folderHolder.getCountTextView().setText(unreadText.isEmpty() ? "0" : unreadText); - final String sendersText = TextUtils.join(", ", folderHolder.getUnreadSenders()); + final String sendersText = TextUtils.join( + getResources().getString(R.string.enumeration_comma), + folderHolder.getUnreadSenders()); folderHolder.getSendersTextView().setText(sendersText); } @@ -555,8 +558,10 @@ public class NestedFolderTeaserView extends LinearLayout implements Conversation final Address[] senderAddresses = Address.parse(unreadSenders); + final BidiFormatter bidiFormatter = mAdapter.getBidiFormatter(); for (final Address senderAddress : senderAddresses) { String sender = senderAddress.getPersonal(); + sender = (sender != null) ? bidiFormatter.unicodeWrap(sender) : null; final String senderEmail = senderAddress.getAddress(); if (!TextUtils.isEmpty(sender)) { |