diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-03-21 18:13:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-21 18:13:28 +0000 |
| commit | 27d8eab266156c53fcc8f1d14831f1b3ab1c430f (patch) | |
| tree | 3ddeb41b864c727fc2e4538161f0a73ba741df95 /src | |
| parent | b792404a80bd6c7d3abcb1aab3dc66dbfce28f5b (diff) | |
| parent | e46a5307264962338b70b22f4b97704714694634 (diff) | |
| download | android_packages_apps_UnifiedEmail-27d8eab266156c53fcc8f1d14831f1b3ab1c430f.tar.gz android_packages_apps_UnifiedEmail-27d8eab266156c53fcc8f1d14831f1b3ab1c430f.tar.bz2 android_packages_apps_UnifiedEmail-27d8eab266156c53fcc8f1d14831f1b3ab1c430f.zip | |
Merge "RTL - show quoted text triangle. Fixes b/13565234." into ub-mail-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/ui/HtmlConversationTemplates.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java index cbfbd841c..3f93589dc 100644 --- a/src/com/android/mail/ui/HtmlConversationTemplates.java +++ b/src/com/android/mail/ui/HtmlConversationTemplates.java @@ -18,6 +18,8 @@ package com.android.mail.ui; import android.content.Context; +import android.support.v4.text.TextUtilsCompat; +import android.support.v4.view.ViewCompat; import com.android.mail.R; import com.android.mail.utils.LogTag; @@ -25,6 +27,7 @@ import com.android.mail.utils.LogUtils; import com.android.mail.utils.Utils; import com.google.common.annotations.VisibleForTesting; +import java.util.Locale; import java.util.regex.Pattern; /** @@ -72,6 +75,9 @@ public class HtmlConversationTemplates extends AbstractHtmlTemplates { */ private static final String IMG_URL_REPLACEMENT = "$1src='data:' blocked-src$2"; + private static final String LEFT_TO_RIGHT_TRIANGLE = "\u25B6 "; + private static final String RIGHT_TO_LEFT_TRIANGLE = "\u25C0 "; + private static boolean sLoadedTemplates; private static String sSuperCollapsed; private static String sBorder; @@ -192,9 +198,13 @@ public class HtmlConversationTemplates extends AbstractHtmlTemplates { final String contentReadyClass = enableContentReadySignal ? "initial-load" : ""; + final boolean isRtl = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) + == ViewCompat.LAYOUT_DIRECTION_RTL; + final String showElided = (isRtl ? RIGHT_TO_LEFT_TRIANGLE : LEFT_TO_RIGHT_TRIANGLE) + + mContext.getString(R.string.show_elided); append(sConversationLower, contentReadyClass, mContext.getString(R.string.hide_elided), - mContext.getString(R.string.show_elided), docBaseUri, conversationBaseUri, - viewportWidth, webviewWidth, enableContentReadySignal, normalizeMessageWidths, + showElided, docBaseUri, conversationBaseUri, viewportWidth, webviewWidth, + enableContentReadySignal, normalizeMessageWidths, enableMungeTables, enableMungeImages); mInProgress = false; |