diff options
| author | 2015-02-21 17:15:00 +0000 | |
|---|---|---|
| committer | 2015-02-21 17:15:00 +0000 | |
| commit | 031a9b13197f6ab1ff83ccdafd890351b70bb63c (patch) | |
| tree | 79c0da51145b31a35df3f2b25fe0652cac6626fe | |
| parent | f1b49e4c51ef41e4d8a94497586b986c82b62293 (diff) | |
| parent | 92c4f1756d4ae8ef1082f159f7133ad811f235d4 (diff) | |
am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo."
* commit '92c4f1756d4ae8ef1082f159f7133ad811f235d4':
Fix 'fuchsia' typo.
| -rw-r--r-- | graphics/java/android/graphics/Color.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java index 8fbedae4caf4..3fe567279591 100644 --- 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) == '#') { |