summaryrefslogtreecommitdiff
path: root/core/java/android/text/TextUtils.java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2012-03-06 13:57:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-06 13:57:16 -0800
commit957c800ac0cb8e375dc3d4c38011456d5c429f95 (patch)
treeaf2c849747cc7dda2b6277ca3700e848daeeb288 /core/java/android/text/TextUtils.java
parentdbaf2cc1bfd96c16cb9b6cb0291b7a8814b3c66f (diff)
parentc70e7a0b8add16d2e6cec4d58c3cc74d08cc20b4 (diff)
Merge "Ellipsize avoids spaces and starts right after text"
Diffstat (limited to 'core/java/android/text/TextUtils.java')
-rw-r--r--core/java/android/text/TextUtils.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index afae5bb2d98c..270624cbfb17 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -1091,13 +1091,13 @@ public class TextUtils {
if (avail < 0) {
// it all goes
} else if (where == TruncateAt.START) {
- right = len - mt.breakText(0, len, false, avail);
+ right = len - mt.breakText(len, false, avail);
} else if (where == TruncateAt.END || where == TruncateAt.END_SMALL) {
- left = mt.breakText(0, len, true, avail);
+ left = mt.breakText(len, true, avail);
} else {
- right = len - mt.breakText(0, len, false, avail / 2);
+ right = len - mt.breakText(len, false, avail / 2);
avail -= mt.measure(right, len);
- left = mt.breakText(0, right, true, avail);
+ left = mt.breakText(right, true, avail);
}
if (callback != null) {