From 4c02e831728daf9374b52e2fe3fdbf7ce982bfc4 Mon Sep 17 00:00:00 2001 From: Raph Levien Date: Fri, 12 Dec 2014 11:17:01 -0800 Subject: [PATCH] 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 --- core/java/android/text/StaticLayout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 9fdf88d5714e9..5b0739707e468 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