diff options
| author | Raph Levien <raph@google.com> | 2014-12-12 11:17:01 -0800 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-12-12 11:24:45 -0800 |
| commit | 4c02e831728daf9374b52e2fe3fdbf7ce982bfc4 (patch) | |
| tree | 56e9bf613512e75ded7e5b2597482a290b6a4674 /core/java/android/text | |
| parent | b16be0706b92763365efac431ea4fac3236359e7 (diff) | |
| download | frameworks_base-4c02e831728daf9374b52e2fe3fdbf7ce982bfc4.zip frameworks_base-4c02e831728daf9374b52e2fe3fdbf7ce982bfc4.tar.gz frameworks_base-4c02e831728daf9374b52e2fe3fdbf7ce982bfc4.tar.bz2 | |
Revert "Fix missing ellipsis when just one character is truncated"
This reverts commit 93e48e8cf18610bfb3f88ccd29891b2959dd606b.
The existing code in master already worked correctly for the original
problem, and this change just introduced a new problem.
Bug: 18576264
Diffstat (limited to 'core/java/android/text')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 9fdf88d..5b07397 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -354,12 +354,14 @@ public class StaticLayout extends Layout { while (breakIndex < breakCount && paraStart + breaks[breakIndex] <= spanEnd) { int endPos = paraStart + breaks[breakIndex]; + boolean moreChars = (endPos < paraEnd); // XXX is this the right way to calculate this? + v = out(source, here, endPos, fmAscent, fmDescent, fmTop, fmBottom, v, spacingmult, spacingadd, chooseHt,chooseHtv, fm, flags[breakIndex], needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, - lineWidths[breakIndex], paint, true); + lineWidths[breakIndex], paint, moreChars); if (endPos < spanEnd) { // preserve metrics for current span |