1 files changed, 7 insertions, 51 deletions

diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java
index 1aab911..160c630 100644
--- a/core/java/android/text/Html.java
+++ b/core/java/android/text/Html.java
@@ -16,6 +16,7 @@
 
 package android.text;
 
+import android.graphics.Color;
 import com.android.internal.util.ArrayUtils;
 import org.ccil.cowan.tagsoup.HTMLSchema;
 import org.ccil.cowan.tagsoup.Parser;
@@ -168,7 +169,7 @@ public class Html {
 
             for(int j = 0; j < style.length; j++) {
                 if (style[j] instanceof AlignmentSpan) {
-                    Layout.Alignment align = 
+                    Layout.Alignment align =
                         ((AlignmentSpan) style[j]).getAlignment();
                     needDiv = true;
                     if (align == Layout.Alignment.ALIGN_CENTER) {
@@ -181,7 +182,7 @@ public class Html {
                 }
             }
             if (needDiv) {
-                out.append("<div " + elements + ">");
+                out.append("<div ").append(elements).append(">");
             }
 
             withinDiv(out, text, i, next);
@@ -199,13 +200,13 @@ public class Html {
             next = text.nextSpanTransition(i, end, QuoteSpan.class);
             QuoteSpan[] quotes = text.getSpans(i, next, QuoteSpan.class);
 
-            for (QuoteSpan quote: quotes) {
+            for (QuoteSpan quote : quotes) {
                 out.append("<blockquote>");
             }
 
             withinBlockquote(out, text, i, next);
 
-            for (QuoteSpan quote: quotes) {
+            for (QuoteSpan quote : quotes) {
                 out.append("</blockquote>\n");
             }
         }
@@ -391,7 +392,7 @@ public class Html {
             } else if (c == '&') {
                 out.append("&amp;");
             } else if (c > 0x7E || c < ' ') {
-                out.append("&#" + ((int) c) + ";");
+                out.append("&#").append((int) c).append(";");
             } else if (c == ' ') {
                 while (i + 1 < end && text.charAt(i + 1) == ' ') {
                     out.append("&nbsp;");
@@ -616,8 +617,6 @@ class HtmlToSpannedConverter implements ContentHandler {
         if (where != len) {
             text.setSpan(repl, where, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
-
-        return;
     }
 
     private static void startImg(SpannableStringBuilder text,
@@ -673,7 +672,7 @@ class HtmlToSpannedConverter implements ContentHandler {
                                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                     }
                 } else {
-                    int c = getHtmlColor(f.mColor);
+                    int c = Color.getHtmlColor(f.mColor);
                     if (c != -1) {
                         text.setSpan(new ForegroundColorSpan(c | 0xFF000000),
                                 where, len,
@@ -842,47 +841,4 @@ class HtmlToSpannedConverter implements ContentHandler {
             mLevel = level;
         }
     }
-
-    private static HashMap<String,Integer> COLORS = buildColorMap();
-
-    private static HashMap<String,Integer> buildColorMap() {
-        HashMap<String,Integer> map = new HashMap<String,Integer>();
-        map.put("aqua", 0x00FFFF);
-        map.put("black", 0x000000);
-        map.put("blue", 0x0000FF);
-        map.put("fuchsia", 0xFF00FF);
-        map.put("green", 0x008000);
-        map.put("grey", 0x808080);
-        map.put("lime", 0x00FF00);
-        map.put("maroon", 0x800000);
-        map.put("navy", 0x000080);
-        map.put("olive", 0x808000);
-        map.put("purple", 0x800080);
-        map.put("red", 0xFF0000);
-        map.put("silver", 0xC0C0C0);
-        map.put("teal", 0x008080);
-        map.put("white", 0xFFFFFF);
-        map.put("yellow", 0xFFFF00);
-        return map;
-    }
-
-    /**
-     * Converts an HTML color (named or numeric) to an integer RGB value.
-     *
-     * @param color Non-null color string.
-     * @return A color value, or {@code -1} if the color string could not be interpreted.
-     */
-    private static int getHtmlColor(String color) {
-        Integer i = COLORS.get(color.toLowerCase());
-        if (i != null) {
-            return i;
-        } else {
-            try {
-                return XmlUtils.convertValueToInt(color, -1);
-            } catch (NumberFormatException nfe) {
-                return -1;
-            }
-        }
-      }
-
 }