Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a736129 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

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

parents 17548b3c aeb60fb8

graphics/java/android/graphics/Color.java

+2 −2
Original line number Diff line number Diff line
@@ -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 {