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

am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev

Browse Source 
* commit '9320bb082f53dfdf34881907a736527b3bdd9b45':
  Fix StaticLayout crash when maxLines = 0
This commit is contained in:
Raph Levien
2015-07-10 19:04:51 +00:00
committed by Android Git Automerger
parent 2cef47ff86 9320bb082f
commit dbcd049ac8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/text/StaticLayout.java
View File

@@ -744,7 +744,8 @@ public class StaticLayout extends Layout {
&& (ellipsize == TextUtils.TruncateAt.END && (ellipsize == TextUtils.TruncateAt.END
|| (mMaximumVisibleLineCount == 1 || (mMaximumVisibleLineCount == 1
&& ellipsize != TextUtils.TruncateAt.MARQUEE)); && ellipsize != TextUtils.TruncateAt.MARQUEE));
if (remainingLineCount < breakCount && ellipsisMayBeApplied) { if (remainingLineCount > 0 && remainingLineCount < breakCount &&
ellipsisMayBeApplied) {
// Treat the last line and overflowed lines as a single line. // Treat the last line and overflowed lines as a single line.
breaks[remainingLineCount - 1] = breaks[breakCount - 1]; breaks[remainingLineCount - 1] = breaks[breakCount - 1];
// Calculate width and flag. // Calculate width and flag.