summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2015-03-04 10:44:46 -0500
committerDerek Sollenberger <djsollen@google.com>2015-03-05 09:37:34 -0500
commita9aded1f6253afbea7906509992a8a3721f731ab (patch)
tree1cc798a79f4df46890c18351413497478fd8f16a /graphics
parentcdcbe17a656f727d8f75d052e5ed8e9627005615 (diff)
downloadframeworks_base-a9aded1f6253afbea7906509992a8a3721f731ab.zip
frameworks_base-a9aded1f6253afbea7906509992a8a3721f731ab.tar.gz
frameworks_base-a9aded1f6253afbea7906509992a8a3721f731ab.tar.bz2
Remove references to SkPorterDuff as it is deprecated.
Change-Id: Ic0722cfef4ed61aa546c495924397097a45cfe77
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/PorterDuff.java14
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;