Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 600ca140: Merge "Use constants instead of resources for ellipsis."

Browse Source 
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
  Use constants instead of resources for ellipsis.
This commit is contained in:
Elliott Hughes
2014-09-19 22:14:48 +00:00
committed by Android Git Automerger
parent 1a4527ce94 600ca140e2
commit 4fec1b4887
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/text/TextUtils.java
View File

@@ -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);
}
/**

8
core/res/res/values/strings.xml
View File

@@ -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>