diff options
| author | 2013-08-01 16:46:04 +0000 | |
|---|---|---|
| committer | 2013-08-01 16:46:04 +0000 | |
| commit | 5d3dff1d66f99fbd5bef9178e62d789119c02ad1 (patch) | |
| tree | f141b912bb1be372cc4f9627fab4a25f492f45bb | |
| parent | 87d01e9e83f33651872b3f3b2a1492c58d3846b5 (diff) | |
| parent | 86d3e03d381bff8c107e3def31cf37f4851f827c (diff) | |
Merge "Add missing alpha channel to built-in colors"
| -rw-r--r-- | graphics/java/android/graphics/Color.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java index 6a4e89a3ba00..f526d2995f6d 100644 --- a/graphics/java/android/graphics/Color.java +++ b/graphics/java/android/graphics/Color.java @@ -406,18 +406,18 @@ public class Color { sColorNameMap.put("yellow", YELLOW); sColorNameMap.put("cyan", CYAN); sColorNameMap.put("magenta", MAGENTA); - sColorNameMap.put("aqua", 0x00FFFF); - sColorNameMap.put("fuchsia", 0xFF00FF); + sColorNameMap.put("aqua", 0xFF00FFFF); + sColorNameMap.put("fuchsia", 0xFFFF00FF); sColorNameMap.put("darkgrey", DKGRAY); sColorNameMap.put("grey", GRAY); sColorNameMap.put("lightgrey", LTGRAY); - sColorNameMap.put("lime", 0x00FF00); - sColorNameMap.put("maroon", 0x800000); - sColorNameMap.put("navy", 0x000080); - sColorNameMap.put("olive", 0x808000); - sColorNameMap.put("purple", 0x800080); - sColorNameMap.put("silver", 0xC0C0C0); - sColorNameMap.put("teal", 0x008080); + sColorNameMap.put("lime", 0xFF00FF00); + sColorNameMap.put("maroon", 0xFF800000); + sColorNameMap.put("navy", 0xFF000080); + sColorNameMap.put("olive", 0xFF808000); + sColorNameMap.put("purple", 0xFF800080); + sColorNameMap.put("silver", 0xFFC0C0C0); + sColorNameMap.put("teal", 0xFF008080); } } |