Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '92c4f1756d4ae8ef1082f159f7133ad811f235d4':
  Fix 'fuchsia' typo.
This commit is contained in:
Elliott Hughes
2015-02-21 17:15:00 +00:00
committed by Android Git Automerger
parent f1b49e4c51 92c4f1756d
commit 031a9b1319
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/graphics/Color.java
View File

@@ -200,10 +200,11 @@ public class Color {
* exception. Supported formats are: * exception. Supported formats are:
* #RRGGBB * #RRGGBB
* #AARRGGBB * #AARRGGBB
* or one of the following names:
* 'red', 'blue', 'green', 'black', 'white', 'gray', 'cyan', 'magenta', * 'red', 'blue', 'green', 'black', 'white', 'gray', 'cyan', 'magenta',
* 'yellow', 'lightgray', 'darkgray', 'grey', 'lightgrey', 'darkgrey', * 'yellow', 'lightgray', 'darkgray', 'grey', 'lightgrey', 'darkgrey',
* 'aqua', 'fuschia', 'lime', 'maroon', 'navy', 'olive', 'purple', * 'aqua', 'fuchsia', 'lime', 'maroon', 'navy', 'olive', 'purple',
* 'silver', 'teal' * 'silver', 'teal'.
*/ */
public static int parseColor(String colorString) { public static int parseColor(String colorString) {
if (colorString.charAt(0) == '#') { if (colorString.charAt(0) == '#') {