diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-02-29 18:43:14 -0800 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-02-29 18:43:14 -0800 |
| commit | 34a126e51aaf22e32c7af808ec6b5a0c41ae3311 (patch) | |
| tree | f3a2036dedd3b03071b5e290c8574cbe96097b1f /core/java/android/text/StaticLayout.java | |
| parent | f64dfccd96286255fd382486c94cdb48921c45fa (diff) | |
Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated
- take care of single line case too
Change-Id: I73c3dcb96f22241b35d7cbaf43cd9bd46a4abcaa
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 1dd4c8a96904..299e1159c27a 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -716,7 +716,8 @@ public class StaticLayout extends Layout { boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount); boolean forceEllipsis = moreChars && (mLineCount + 1 == mMaximumVisibleLineCount); - boolean doEllipsis = (firstLine && !moreChars && + boolean doEllipsis = + (((mMaximumVisibleLineCount == 1 && moreChars) || (firstLine && !moreChars)) && ellipsize != TextUtils.TruncateAt.MARQUEE) || (!firstLine && (currentLineIsTheLastVisibleOne || !moreChars) && ellipsize == TextUtils.TruncateAt.END); |