RTL - show quoted text triangle. Fixes b/13565234.

Previously we included the right-pointing triangle
in the string translation. But that doesn't work for
RTL where the string should be left-pointing. So
now we prepend the proper triangle in code.

Change-Id: I53e09fcb623e65972710ac5c3d8baaef8229d168

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;