commit d24047dcfed3fb7c913a0a5950c9f48ce3d49b9e
author Raph Levien <raph@google.com> Thu Jan 29 23:04:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 29 23:04:15 2015 +0000
tree 6d8c40409625505cf0252133ef890cc936e71a30
parent 9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895
parent 6f9f1d4b3b9f9844dc294758398f87cc7aa934b0

Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev

core/java/android/text/TextUtils.java

diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index 3502b52..8a8c6d8 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -63,6 +63,8 @@
 
 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 */ }
@@ -1081,14 +1083,9 @@
                                          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);
     }
 
     /**

core/res/res/values/strings.xml

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 0d76c25..20b4b62 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -82,14 +82,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>