commit eab8e18d8f6f34a9d35fbb120148956789ad48a2
author Elliott Hughes <enh@google.com> Mon Aug 05 11:07:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 05 11:07:13 2013 -0700
tree 4a4922eba29897176d62632b920a71b747c8fe90
parent c8911ddd486776662e09a6822d4929074d40024d
parent 8a736129faa9e41b5f33c42bbeae1f68cb42d38f

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

* commit '8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
  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 6a4e89a..933948d 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 {