diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-21 17:24:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-21 17:24:33 +0000 |
| commit | 65bc1f521417a90fcf09d508f90b27cae2c786f7 (patch) | |
| tree | d60a41b474cb17aff5d16bab55b34e9224a6038f /graphics | |
| parent | c8c8cbc6e5e8f1fa006815d6e9ee4368308bf6e0 (diff) | |
| parent | 031a9b13197f6ab1ff83ccdafd890351b70bb63c (diff) | |
| download | frameworks_base-65bc1f521417a90fcf09d508f90b27cae2c786f7.zip frameworks_base-65bc1f521417a90fcf09d508f90b27cae2c786f7.tar.gz frameworks_base-65bc1f521417a90fcf09d508f90b27cae2c786f7.tar.bz2 | |
am 031a9b13: am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo."
* commit '031a9b13197f6ab1ff83ccdafd890351b70bb63c':
Fix 'fuchsia' typo.
Diffstat (limited to 'graphics')
| -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) == '#') { |