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

Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-08-14 14:03:50 -07:00
committed by Android (Google) Code Review
parent 41f71dc814 f3e64101bb
commit d63b992210
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1042,9 +1042,14 @@ public class TextUtils {
float avail, TruncateAt where, float avail, TruncateAt where,
boolean preserveLength, boolean preserveLength,
EllipsizeCallback callback) { 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, return ellipsize(text, paint, avail, where, preserveLength, callback,
TextDirectionHeuristics.FIRSTSTRONG_LTR, TextDirectionHeuristics.FIRSTSTRONG_LTR,
(where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS : ELLIPSIS_NORMAL); ellipsis);
} }
/** /**
@@ -1700,9 +1705,4 @@ public class TextUtils {
private static String[] EMPTY_STRING_ARRAY = new String[]{}; private static String[] EMPTY_STRING_ARRAY = new String[]{};
private static final char ZWNBS_CHAR = '\uFEFF'; private static final char ZWNBS_CHAR = '\uFEFF';
private static final String ELLIPSIS_NORMAL = Resources.getSystem().getString(
R.string.ellipsis);
private static final String ELLIPSIS_TWO_DOTS = Resources.getSystem().getString(
R.string.ellipsis_two_dots);
} }