From 36d7549181af397cfaf879f46e407e762e0e8cba Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Mon, 23 Jan 2012 16:26:46 -0800
Subject: [PATCH] Update hardware acceleration doc

Change-Id: I3bed77b3c4e1eff96fa462e4849f25f38784c415
---
 api/current.txt                               |  4 +--
 .../guide/topics/graphics/hardware-accel.jd   | 28 +++++++++++++++++++
 .../java/android/graphics/AvoidXfermode.java  |  1 +
 .../android/graphics/PixelXorXfermode.java    |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 887cfe29d9abf..be296b2408276 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 e3ff2159304fa..3e24c5ca6be86 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>
@@ -335,6 +345,24 @@ changed.</li>
       </ul>
     </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>
 
diff --git a/graphics/java/android/graphics/AvoidXfermode.java b/graphics/java/android/graphics/AvoidXfermode.java
index 7e2722d6fe0d1..5a59e367f9c00 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 18d15cf1c2240..6075ec3927b7f 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) {