Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30c1738b authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21638 into eclair 

* changes:
  Don't use BoringLayout to display text that has paragraph-style markup.
parents 51782509 86fcef87

core/java/android/text/BoringLayout.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {