diff options
-rw-r--r-- | api/current.txt | 4 | ||||
-rw-r--r-- | docs/html/guide/topics/graphics/hardware-accel.jd | 28 | ||||
-rw-r--r-- | graphics/java/android/graphics/AvoidXfermode.java | 1 | ||||
-rw-r--r-- | graphics/java/android/graphics/PixelXorXfermode.java | 1 |
4 files changed, 32 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 887cfe2..be296b2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7785,7 +7785,7 @@ package android.gesture { package android.graphics { - public class AvoidXfermode extends android.graphics.Xfermode { + public deprecated class AvoidXfermode extends android.graphics.Xfermode { ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode); } @@ -8564,7 +8564,7 @@ package android.graphics { field public int bytesPerPixel; } - public class PixelXorXfermode extends android.graphics.Xfermode { + public deprecated class PixelXorXfermode extends android.graphics.Xfermode { ctor public PixelXorXfermode(int); } diff --git a/docs/html/guide/topics/graphics/hardware-accel.jd b/docs/html/guide/topics/graphics/hardware-accel.jd index e3ff215..3e24c5c 100644 --- a/docs/html/guide/topics/graphics/hardware-accel.jd +++ b/docs/html/guide/topics/graphics/hardware-accel.jd @@ -300,6 +300,16 @@ changed.</li> <li>{@link android.graphics.Paint#setRasterizer setRasterizer()}</li> </ul> </li> + + <li> + <strong>Xfermodes</strong> + + <ul> + <li>{@link android.graphics.AvoidXfermode AvoidXfermode}</li> + + <li>{@link android.graphics.PixelXorXfermode PixelXorXfermode}</li> + </ul> + </li> </ul> <p>In addition, some operations behave differently with hardware acceleration enabled:</p> @@ -336,6 +346,24 @@ changed.</li> </li> <li> + <strong>PorterDuffXfermode</strong> + + <ul> + <li>{@link android.graphics.PorterDuff.Mode#DARKEN PorterDuff.Mode.DARKEN} will + be equivalent to {@link android.graphics.PorterDuff.Mode#SRC_OVER} when blending + against the framebuffer.</li> + + <li>{@link android.graphics.PorterDuff.Mode#LIGHTEN PorterDuff.Mode.LIGHTEN} will + be equivalent to {@link android.graphics.PorterDuff.Mode#SRC_OVER} when blending + against the framebuffer.</li> + + <li>{@link android.graphics.PorterDuff.Mode#OVERLAY PorterDuff.Mode.OVERLAY} will + be equivalent to {@link android.graphics.PorterDuff.Mode#SRC_OVER} when blending + against the framebuffer.</li> + </ul> + </li> + + <li> <strong>ComposeShader</strong> <ul> diff --git a/graphics/java/android/graphics/AvoidXfermode.java b/graphics/java/android/graphics/AvoidXfermode.java index 7e2722d..5a59e36 100644 --- a/graphics/java/android/graphics/AvoidXfermode.java +++ b/graphics/java/android/graphics/AvoidXfermode.java @@ -20,6 +20,7 @@ package android.graphics; * AvoidXfermode xfermode will draw the src everywhere except on top of the * opColor or, depending on the Mode, draw only on top of the opColor. */ +@Deprecated public class AvoidXfermode extends Xfermode { // these need to match the enum in SkAvoidXfermode.h on the native side diff --git a/graphics/java/android/graphics/PixelXorXfermode.java b/graphics/java/android/graphics/PixelXorXfermode.java index 18d15cf..6075ec3 100644 --- a/graphics/java/android/graphics/PixelXorXfermode.java +++ b/graphics/java/android/graphics/PixelXorXfermode.java @@ -22,6 +22,7 @@ package android.graphics; * this mode *always* returns an opaque color (alpha == 255). Thus it is * not really usefull for operating on blended colors. */ +@Deprecated public class PixelXorXfermode extends Xfermode { public PixelXorXfermode(int opColor) { |