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

* commit '92c4f1756d4ae8ef1082f159f7133ad811f235d4': Fix 'fuchsia' typo.
2015-02-21 17:15:00 +00:00
parent f1b49e4c51 92c4f1756d
commit 031a9b1319
1 changed files with 3 additions and 2 deletions
--- a/graphics/java/android/graphics/Color.java
+++ b/graphics/java/android/graphics/Color.java
@@ -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) == '#') {