diff options
| author | Eric Fischer <enf@google.com> | 2010-08-05 15:29:36 -0700 |
|---|---|---|
| committer | Eric Fischer <enf@google.com> | 2010-08-05 15:29:36 -0700 |
| commit | 74d31ef2b2c42b54fa1f7cf94ea955ea67ab69a0 (patch) | |
| tree | 9f3be4386fec6ba31db86ac8d1e6358334a17ea9 /core/java/android/text/StaticLayout.java | |
| parent | 507a4ea34038daa521036d4c820288b3166a0ed5 (diff) | |
Fix a bug where paragraph styles could leak onto an adjacent empty line.
When the text ends with an empty line, the getSpans() call to retrieve
styles for it would also retrieve the styles of the preceding line.
Add a special case to detect and prevent this.
Change-Id: I888131cacce6bf45e68c53c931ebe8d58db0b7a9
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 44157de670f9..cc969cb9f50c 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -155,7 +155,7 @@ extends Layout LineHeightSpan[] chooseht = null; if (spanned != null) { - LeadingMarginSpan[] sp = spanned.getSpans(paraStart, paraEnd, + LeadingMarginSpan[] sp = getParagraphSpans(spanned, paraStart, paraEnd, LeadingMarginSpan.class); for (int i = 0; i < sp.length; i++) { LeadingMarginSpan lms = sp[i]; @@ -174,7 +174,7 @@ extends Layout } } - chooseht = spanned.getSpans(paraStart, paraEnd, LineHeightSpan.class); + chooseht = getParagraphSpans(spanned, paraStart, paraEnd, LineHeightSpan.class); if (chooseht.length != 0) { if (choosehtv == null || @@ -267,7 +267,7 @@ extends Layout hasTabOrEmoji = true; if (spanned != null) { // First tab this para, check for tabstops - TabStopSpan[] spans = spanned.getSpans(paraStart, + TabStopSpan[] spans = getParagraphSpans(spanned, paraStart, paraEnd, TabStopSpan.class); if (spans.length > 0) { tabStops = new TabStops(TAB_INCREMENT, spans); |