Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "If graphics wants ASCII lowercasing, it needs to ask for it."

Browse Source
This commit is contained in:
Elliott Hughes
2013-08-05 18:01:33 +00:00
committed by Gerrit Code Review
parent 17548b3c70 aeb60fb86f
commit 8a736129fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/Color.java
View File

@@ -217,7 +217,7 @@ public class Color {
} }
return (int)color; return (int)color;
} else { } else {
Integer color = sColorNameMap.get(colorString.toLowerCase(Locale.US)); Integer color = sColorNameMap.get(colorString.toLowerCase(Locale.ROOT));
if (color != null) { if (color != null) {
return color; return color;
} }
@@ -379,7 +379,7 @@ public class Color {
* @hide * @hide
*/ */
public static int getHtmlColor(String color) { public static int getHtmlColor(String color) {
Integer i = sColorNameMap.get(color.toLowerCase()); Integer i = sColorNameMap.get(color.toLowerCase(Locale.ROOT));
if (i != null) { if (i != null) {
return i; return i;
} else { } else {