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

Commit 031a9b13 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo." 

* commit '92c4f175':
  Fix 'fuchsia' typo.
parents f1b49e4c 92c4f175

graphics/java/android/graphics/Color.java

+3 −2
Original line number Diff line number Diff line
@@ -200,10 +200,11 @@ public class Color { 
     * exception. Supported formats are:

     * #RRGGBB

     * #AARRGGBB

     * or one of the following names:

     * 'red', 'blue', 'green', 'black', 'white', 'gray', 'cyan', 'magenta',

     * 'yellow', 'lightgray', 'darkgray', 'grey', 'lightgrey', 'darkgrey',

     * 'aqua', 'fuschia', 'lime', 'maroon', 'navy', 'olive', 'purple',

     * 'silver', 'teal'

     * 'aqua', 'fuchsia', 'lime', 'maroon', 'navy', 'olive', 'purple',

     * 'silver', 'teal'.

     */

    public static int parseColor(String colorString) {

        if (colorString.charAt(0) == '#') {