am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev

* commit '6b3bf0ceef92d1a627360c6502f52f0237f7e50a':
  Add offset method to Outline

api/current.txt

@@ -10933,6 +10933,7 @@ package android.graphics {
     method public boolean canClip();
     method public float getAlpha();
     method public boolean isEmpty();
+    method public void offset(int, int);
     method public void set(android.graphics.Outline);
     method public void setAlpha(float);
     method public void setConvexPath(android.graphics.Path);

graphics/java/android/graphics/Outline.java

@@ -221,4 +221,15 @@ public final class Outline {
         mRect = null;
         mRadius = -1.0f;
     }
+
+    /**
+     * Offsets the Outline by (dx,dy)
+     */
+    public void offset(int dx, int dy) {
+        if (mRect != null) {
+            mRect.offset(dx, dy);
+        } else if (mPath != null) {
+            mPath.offset(dx, dy);
+        }
+    }
 }

graphics/java/android/graphics/Path.java

@@ -678,7 +678,7 @@ public class Path {
     }
 
     /**
-     * Offset the path by (dx,dy), returning true on success
+     * Offset the path by (dx,dy)
      *
      * @param dx  The amount in the X direction to offset the entire path
      * @param dy  The amount in the Y direction to offset the entire path
@@ -695,7 +695,7 @@ public class Path {
     }
 
     /**
-     * Offset the path by (dx,dy), returning true on success
+     * Offset the path by (dx,dy)
      *
      * @param dx The amount in the X direction to offset the entire path
      * @param dy The amount in the Y direction to offset the entire path