Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c3784c4d6140517a6927685f552fa8719353e46f':
  Add offset method to Outline
This commit is contained in:
Chris Craik
2014-11-14 00:03:33 +00:00
committed by Android Git Automerger
parent 8f5de8c6c0 c3784c4d61
commit bbac83fc79
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

11
graphics/java/android/graphics/Outline.java
View File

@@ -221,4 +221,15 @@ public final class Outline {
mRect = null; mRect = null;
mRadius = -1.0f; 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);
}
}
} }

4
graphics/java/android/graphics/Path.java
View File

@@ -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 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 * @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 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 * @param dy The amount in the Y direction to offset the entire path