diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-06 18:42:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-06 18:42:30 +0000 |
| commit | 2d08eaf0341df5d22236baadbcc4341f0e2e7f5e (patch) | |
| tree | 96789154ea6e71825059cb35a5cabd133647bd01 /graphics | |
| parent | fdbf68ff6c5e45da4971352775d614e6790cc991 (diff) | |
| parent | 1526a458a30184609f19b05e7334da3cbde81dd1 (diff) | |
| download | frameworks_base-2d08eaf0341df5d22236baadbcc4341f0e2e7f5e.zip frameworks_base-2d08eaf0341df5d22236baadbcc4341f0e2e7f5e.tar.gz frameworks_base-2d08eaf0341df5d22236baadbcc4341f0e2e7f5e.tar.bz2 | |
Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""
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; |