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

Commit 5e9ed365 authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Support strikethrough text in Html.fromHtml(). 

All the three tags, <del>, <s>, and <strike> are now converted to
strikethrough text.

Bug: 21025743
Change-Id: I62dc9793223e266f6e2181169766fde8be0e2aa7
parent d38e7c93

core/java/android/text/Html.java

+13 −0
Original line number Diff line number Diff line
@@ -514,6 +514,12 @@ class HtmlToSpannedConverter implements ContentHandler { 
            startA(mSpannableStringBuilder, attributes);

        } else if (tag.equalsIgnoreCase("u")) {

            start(mSpannableStringBuilder, new Underline());

        } else if (tag.equalsIgnoreCase("del")) {

            start(mSpannableStringBuilder, new Strikethrough());

        } else if (tag.equalsIgnoreCase("s")) {

            start(mSpannableStringBuilder, new Strikethrough());

        } else if (tag.equalsIgnoreCase("strike")) {

            start(mSpannableStringBuilder, new Strikethrough());

        } else if (tag.equalsIgnoreCase("sup")) {

            start(mSpannableStringBuilder, new Super());

        } else if (tag.equalsIgnoreCase("sub")) {
@@ -565,6 +571,12 @@ class HtmlToSpannedConverter implements ContentHandler { 
            endA(mSpannableStringBuilder);

        } else if (tag.equalsIgnoreCase("u")) {

            end(mSpannableStringBuilder, Underline.class, new UnderlineSpan());

        } else if (tag.equalsIgnoreCase("del")) {

            end(mSpannableStringBuilder, Strikethrough.class, new StrikethroughSpan());

        } else if (tag.equalsIgnoreCase("s")) {

            end(mSpannableStringBuilder, Strikethrough.class, new StrikethroughSpan());

        } else if (tag.equalsIgnoreCase("strike")) {

            end(mSpannableStringBuilder, Strikethrough.class, new StrikethroughSpan());

        } else if (tag.equalsIgnoreCase("sup")) {

            end(mSpannableStringBuilder, Super.class, new SuperscriptSpan());

        } else if (tag.equalsIgnoreCase("sub")) {
@@ -822,6 +834,7 @@ class HtmlToSpannedConverter implements ContentHandler { 
    private static class Bold { }

    private static class Italic { }

    private static class Underline { }

    private static class Strikethrough { }

    private static class Big { }

    private static class Small { }

    private static class Monospace { }