Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reverse check for multi-character ellipsis"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-03 23:16:46 +00:00
committed by Android (Google) Code Review
parent f45256ad63 55fd45b273
commit bb29df8b14
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/Layout.java
View File

@@ -2067,9 +2067,11 @@ 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 (i < ellipsisStringLen && ellipsisCount <= ellipsisStringLen) {
if (useEllipsisString && i < ellipsisStringLen) {
c = ellipsisString.charAt(i);
} else {
c = TextUtils.ELLIPSIS_FILLER;