commit f2ce9f994a0dba5e3d97b5d4ae97eddb0008b7b5
author Elliott Hughes <enh@google.com> Mon Aug 05 11:10:06 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 05 11:10:06 2013 -0700
tree 996e5051375762b9b24f04ea788d6ec06f660b7d
parent f7d280396c3ae4d76915cadeb29df556d6cd8d38
parent eab8e18d8f6f34a9d35fbb120148956789ad48a2

am eab8e18d: am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."

* commit 'eab8e18d8f6f34a9d35fbb120148956789ad48a2':
  If graphics wants ASCII lowercasing, it needs to ask for it.

graphics/java/android/graphics/Color.java

diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java
index f526d29..8fbedae 100644
--- a/graphics/java/android/graphics/Color.java
+++ b/graphics/java/android/graphics/Color.java
@@ -217,7 +217,7 @@
             }
             return (int)color;
         } else {
-            Integer color = sColorNameMap.get(colorString.toLowerCase(Locale.US));
+            Integer color = sColorNameMap.get(colorString.toLowerCase(Locale.ROOT));
             if (color != null) {
                 return color;
             }
@@ -379,7 +379,7 @@
      * @hide
      */
     public static int getHtmlColor(String color) {
-        Integer i = sColorNameMap.get(color.toLowerCase());
+        Integer i = sColorNameMap.get(color.toLowerCase(Locale.ROOT));
         if (i != null) {
             return i;
         } else {