diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-21 17:04:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-21 17:04:21 +0000 |
| commit | d002e02750b51fed3da41a2b4b222824df8d1a10 (patch) | |
| tree | 02852f7fa4d1eb81fcde6d70d6e7a3588c07e959 | |
| parent | adb52ef7034d4d3e0eee58cedae2a343d29771b9 (diff) | |
| parent | fd9bc7bb36c68a104c739e378086ac82ace29c4b (diff) | |
| download | frameworks_base-d002e02750b51fed3da41a2b4b222824df8d1a10.zip frameworks_base-d002e02750b51fed3da41a2b4b222824df8d1a10.tar.gz frameworks_base-d002e02750b51fed3da41a2b4b222824df8d1a10.tar.bz2 | |
Merge "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 8fbedae..3fe5672 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) == '#') { |