summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Muramatsu <btmura@google.com>2011-01-28 14:51:10 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-28 14:51:10 -0800
commit9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0 (patch)
treedc62f7bfdd51155174895d1519c02fc7de3a6dbc
parentb0c939adfa339c5cbb7f458072119269368b3ba5 (diff)
parent4c8ad6eb6241a0f689e49237ecadb65e8ffa4b6c (diff)
downloadframeworks_base-9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0.zip
frameworks_base-9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0.tar.gz
frameworks_base-9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0.tar.bz2
Merge "Fix TextUtils#commaEllipsize" into honeycomb
-rw-r--r--core/java/android/text/TextUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index 7748265..d5010c6 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -1142,7 +1142,7 @@ public class TextUtils {
// XXX this is probably ok, but need to look at it more
tempMt.setPara(format, 0, format.length(), request);
- float moreWid = mt.addStyleRun(p, mt.mLen, null);
+ float moreWid = tempMt.addStyleRun(p, tempMt.mLen, null);
if (w + moreWid <= avail) {
ok = i + 1;