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

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

Browse Source 
* commit '8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
  If graphics wants ASCII lowercasing, it needs to ask for it.
This commit is contained in:
Elliott Hughes
2013-08-05 11:07:13 -07:00
committed by Android Git Automerger
parent c8911ddd48 8a736129fa
commit eab8e18d8f
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;
} 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 {