diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-05 18:01:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-05 18:01:33 +0000 |
| commit | 8a736129faa9e41b5f33c42bbeae1f68cb42d38f (patch) | |
| tree | a9b7406ba551bb8d3e9b55d18c8a699a84246bbc | |
| parent | 17548b3c70fe4f29d33367a61300f5323f5efe99 (diff) | |
| parent | aeb60fb86fc572500239c6f6684d1eb71e3ae35b (diff) | |
| download | base-8a736129faa9e41b5f33c42bbeae1f68cb42d38f.tar.gz | |
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
| -rw-r--r-- | graphics/java/android/graphics/Color.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java index 6a4e89a3ba00..933948d564db 100644 --- a/graphics/java/android/graphics/Color.java +++ b/graphics/java/android/graphics/Color.java @@ -217,7 +217,7 @@ public class Color { } 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 @@ public class Color { * @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 { |