summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/android/text/TextUtils.java9
-rw-r--r--core/res/res/values/strings.xml8
2 files changed, 3 insertions, 14 deletions
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 @@ 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 */ }
@@ -1081,14 +1083,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 53cb076..a0aec5a 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -79,14 +79,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>