diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-06 18:42:15 +0000 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-03-06 18:42:15 +0000 |
| commit | 1526a458a30184609f19b05e7334da3cbde81dd1 (patch) | |
| tree | 1cc798a79f4df46890c18351413497478fd8f16a /graphics | |
| parent | 26b4f598c8b1e99b43261614a6861785638c8c00 (diff) | |
| download | frameworks_base-1526a458a30184609f19b05e7334da3cbde81dd1.zip frameworks_base-1526a458a30184609f19b05e7334da3cbde81dd1.tar.gz frameworks_base-1526a458a30184609f19b05e7334da3cbde81dd1.tar.bz2 | |
Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""
Fix build breakage.
This reverts commit 26b4f598c8b1e99b43261614a6861785638c8c00.
Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/PorterDuff.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/java/android/graphics/PorterDuff.java b/graphics/java/android/graphics/PorterDuff.java index 2ef1662..f5fbe70 100644 --- a/graphics/java/android/graphics/PorterDuff.java +++ b/graphics/java/android/graphics/PorterDuff.java @@ -18,7 +18,7 @@ package android.graphics; public class PorterDuff { - // these value must match their native equivalents. See SkPorterDuff.h + // these value must match their native equivalents. See SkXfermode.h public enum Mode { /** [0, 0] */ CLEAR (0), @@ -46,17 +46,17 @@ public class PorterDuff { XOR (11), /** [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + min(Sc, Dc)] */ - DARKEN (12), + DARKEN (16), /** [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + max(Sc, Dc)] */ - LIGHTEN (13), + LIGHTEN (17), /** [Sa * Da, Sc * Dc] */ - MULTIPLY (14), + MULTIPLY (24), /** [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] */ - SCREEN (15), + SCREEN (14), /** Saturate(S + D) */ - ADD (16), - OVERLAY (17); + ADD (12), + OVERLAY (15); Mode(int nativeInt) { this.nativeInt = nativeInt; |