summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-08-02 09:31:11 -0700
committerElliott Hughes <enh@google.com>2013-08-02 09:31:11 -0700
commitaeb60fb86fc572500239c6f6684d1eb71e3ae35b (patch)
tree5d3d16485a73fe2aba3776c49404c290d24014f5 /graphics
parentc67b2ed50226c4758d0fc1434d39f6add6a0a533 (diff)
downloadframeworks_base-aeb60fb86fc572500239c6f6684d1eb71e3ae35b.zip
frameworks_base-aeb60fb86fc572500239c6f6684d1eb71e3ae35b.tar.gz
frameworks_base-aeb60fb86fc572500239c6f6684d1eb71e3ae35b.tar.bz2
If graphics wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html Bug: https://code.google.com/p/android/issues/detail?id=58359 Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Color.java4
1 files changed, 2 insertions, 2 deletions
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 @@ 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 {