diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-06 18:16:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-06 18:16:45 +0000 |
| commit | fdbf68ff6c5e45da4971352775d614e6790cc991 (patch) | |
| tree | 7a4dcec6b82eaac58019865153c579304cccca6c /graphics | |
| parent | f045198fb3b008e0341f0b9761e4ef96310e7333 (diff) | |
| parent | 26b4f598c8b1e99b43261614a6861785638c8c00 (diff) | |
| download | frameworks_base-fdbf68ff6c5e45da4971352775d614e6790cc991.zip frameworks_base-fdbf68ff6c5e45da4971352775d614e6790cc991.tar.gz frameworks_base-fdbf68ff6c5e45da4971352775d614e6790cc991.tar.bz2 | |
Merge "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 f5fbe70..2ef1662 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 SkXfermode.h + // these value must match their native equivalents. See SkPorterDuff.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 (16), + DARKEN (12), /** [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + max(Sc, Dc)] */ - LIGHTEN (17), + LIGHTEN (13), /** [Sa * Da, Sc * Dc] */ - MULTIPLY (24), + MULTIPLY (14), /** [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] */ - SCREEN (14), + SCREEN (15), /** Saturate(S + D) */ - ADD (12), - OVERLAY (15); + ADD (16), + OVERLAY (17); Mode(int nativeInt) { this.nativeInt = nativeInt; |