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

am 30c1738b: Merge change 21638 into eclair

Browse Source 
Merge commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03'

* commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03':
  Don't use BoringLayout to display text that has paragraph-style markup.
This commit is contained in:
Eric Fischer
2009-08-17 17:28:22 -07:00
committed by Android Git Automerger
parent 0e4e11b7ca 30c1738b2c
commit 7ae01943aa
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/text/BoringLayout.java
View File

@@ -19,6 +19,7 @@ package android.text;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;
import android.text.style.ParagraphStyle;
import android.util.FloatMath;
/**
@@ -262,6 +263,14 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
TextUtils.recycle(temp);
if (boring && text instanceof Spanned) {
Spanned sp = (Spanned) text;
Object[] styles = sp.getSpans(0, text.length(), ParagraphStyle.class);
if (styles.length > 0) {
boring = false;
}
}
if (boring) {
Metrics fm = metrics;
if (fm == null) {