From 7f0ebc944d49ffc1a5f269bad6acea6112a67261 Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Wed, 2 Aug 2017 22:47:14 +0000 Subject: Revert "Make ellipsize retry if text doesn't fit" This reverts commit 1051bbe325a2fac9d5b074367d878318e2326485. Bug: 64312574 Change-Id: I6a3456172e22e94df30dcbe90988db8592886a78 --- core/java/android/text/Layout.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/java/android/text/Layout.java') diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index ecefce917a7d..2c84ba005352 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -2067,11 +2067,9 @@ public abstract class Layout { final String ellipsisString = TextUtils.getEllipsisString(method); final int ellipsisStringLen = ellipsisString.length(); - // Use the ellipsis string only if there are that at least as many characters to replace. - final boolean useEllipsisString = ellipsisCount >= ellipsisStringLen; for (int i = 0; i < ellipsisCount; i++) { final char c; - if (useEllipsisString && i < ellipsisStringLen) { + if (i < ellipsisStringLen && ellipsisCount <= ellipsisStringLen) { c = ellipsisString.charAt(i); } else { c = TextUtils.ELLIPSIS_FILLER; -- cgit v1.2.3