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

Commit 5c02d737 authored by Daniel U's avatar Daniel U
Browse files

Support more CharacterStyles in toHtml() conversion 

- Add support to convert BackgroundColorSpan
- Convert StrikethroughSpan to <span> with CSS styling instead of <strike>
- Convert ForegroundColorSpan to <span> with CSS styling instead of <font>

Change-Id: I05ff6b97534df9ee586a552c7e6435aabca152ac
parent f550d3c7

core/java/android/text/Html.java

+18 −17
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.graphics.Typeface; 
import android.graphics.drawable.Drawable;

import android.text.style.AbsoluteSizeSpan;

import android.text.style.AlignmentSpan;

import android.text.style.BackgroundColorSpan;

import android.text.style.BulletSpan;

import android.text.style.CharacterStyle;

import android.text.style.ForegroundColorSpan;
@@ -269,7 +270,7 @@ public class Html { 
        int len = text.length();



        int next;

        for (int i = 0; i < text.length(); i = next) {

        for (int i = 0; i < len; i = next) {

            next = text.nextSpanTransition(i, len, ParagraphStyle.class);

            ParagraphStyle[] style = text.getSpans(i, next, ParagraphStyle.class);

            String elements = " ";
@@ -366,14 +367,12 @@ public class Html { 
    }



    /* Returns true if the caller should close and reopen the paragraph. */

    private static boolean withinParagraph(StringBuilder out, Spanned text,

                                        int start, int end, int nl,

                                        boolean last) {

    private static boolean withinParagraph(StringBuilder out, Spanned text, int start, int end,

            int nl, boolean last) {

        int next;

        for (int i = start; i < end; i = next) {

            next = text.nextSpanTransition(i, end, CharacterStyle.class);

            CharacterStyle[] style = text.getSpans(i, next,

                                                   CharacterStyle.class);

            CharacterStyle[] style = text.getSpans(i, next, CharacterStyle.class);



            for (int j = 0; j < style.length; j++) {

                if (style[j] instanceof StyleSpan) {
@@ -403,7 +402,7 @@ public class Html { 
                    out.append("<u>");

                }

                if (style[j] instanceof StrikethroughSpan) {

                    out.append("<strike>");

                    out.append("<span style=\"text-decoration:line-through;\">");

                }

                if (style[j] instanceof URLSpan) {

                    out.append("<a href=\"");
@@ -424,22 +423,24 @@ public class Html { 
                    out.append("\">");

                }

                if (style[j] instanceof ForegroundColorSpan) {

                    out.append("<font color =\"#");

                    String color = Integer.toHexString(((ForegroundColorSpan)

                            style[j]).getForegroundColor() + 0x01000000);

                    while (color.length() < 6) {

                        color = "0" + color;

                    int color = ((ForegroundColorSpan) style[j]).getForegroundColor();

                    out.append(String.format("<span style=\"color:#%06X;\">", 0xFFFFFF & color));

                }

                    out.append(color);

                    out.append("\">");

                if (style[j] instanceof BackgroundColorSpan) {

                    int color = ((BackgroundColorSpan) style[j]).getBackgroundColor();

                    out.append(String.format("<span style=\"background-color:#%06X;\">",

                            0xFFFFFF & color));

                }

            }



            withinStyle(out, text, i, next);



            for (int j = style.length - 1; j >= 0; j--) {

                if (style[j] instanceof BackgroundColorSpan) {

                    out.append("</span>");

                }

                if (style[j] instanceof ForegroundColorSpan) {

                    out.append("</font>");

                    out.append("</span>");

                }

                if (style[j] instanceof AbsoluteSizeSpan) {

                    out.append("</font>");
@@ -448,7 +449,7 @@ public class Html { 
                    out.append("</a>");

                }

                if (style[j] instanceof StrikethroughSpan) {

                    out.append("</strike>");

                    out.append("</span>");

                }

                if (style[j] instanceof UnderlineSpan) {

                    out.append("</u>");