From ed0daa93e48d38e54a7ad1c99c461510a4c07599 Mon Sep 17 00:00:00 2001
From: Igor Viarheichyk <viarheichyk@google.com>
Date: Thu, 11 Sep 2014 15:07:05 -0700
Subject: [PATCH] Use constants instead of resources for ellipsis.

All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
---
 core/java/android/text/TextUtils.java | 9 +++------
 core/res/res/values/strings.xml       | 8 --------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index a5e62e159d1b9..dcf3a40f54dcf 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -61,6 +61,8 @@ import java.util.regex.Pattern;
 
 public class TextUtils {
     private static final String TAG = "TextUtils";
+    private static final String ELLIPSIS = new String(Layout.ELLIPSIS_NORMAL);
+    private static final String ELLIPSIS_TWO_DOTS = new String(Layout.ELLIPSIS_TWO_DOTS);
 
 
     private TextUtils() { /* cannot be instantiated */ }
@@ -1068,14 +1070,9 @@ public class TextUtils {
                                          float avail, TruncateAt where,
                                          boolean preserveLength,
                                          EllipsizeCallback callback) {
-
-        final String ellipsis = (where == TruncateAt.END_SMALL) ?
-                Resources.getSystem().getString(R.string.ellipsis_two_dots) :
-                Resources.getSystem().getString(R.string.ellipsis);
-
         return ellipsize(text, paint, avail, where, preserveLength, callback,
                 TextDirectionHeuristics.FIRSTSTRONG_LTR,
-                ellipsis);
+                (where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS : ELLIPSIS);
     }
 
     /**
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index cc2a298bc6f00..f5c3b966241b8 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -40,14 +40,6 @@
          for a note with no name. -->
     <string name="untitled">&lt;Untitled&gt;</string>
 
-    <!-- Used to replace a range of characters in text that is too wide
-         for the space allocated to it (three dots). -->
-    <string name="ellipsis">\u2026</string>
-
-    <!-- Used to replace a range of characters in text that is too wide
-         for the space allocated to it (two dots). -->
-    <string name="ellipsis_two_dots">\u2025</string>
-
     <!-- How to display the lack of a phone number -->
     <string name="emptyPhoneNumber">(No phone number)</string>