summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2016-08-01 21:26:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-08-01 21:26:09 +0000
commit1b4ab52e248a4a6e9d53f0878024c81aeb561b20 (patch)
tree4fea58cf1763bf8f452d0f6f8bf0cb1970b621f7
parent559f9b704ff365fb65d05401bc614a9177441dbe (diff)
parent19e710e7b568fc3434025b6cb36a6ea81a4a25da (diff)
Merge "Expose Path.approximate()"
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--graphics/java/android/graphics/Path.java1
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 778ef7b1d789..64838a4ef053 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12295,6 +12295,7 @@ package android.graphics {
method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public float[] approximate(float);
method public void arcTo(android.graphics.RectF, float, float, boolean);
method public void arcTo(android.graphics.RectF, float, float);
method public void arcTo(float, float, float, float, float, float, boolean);
diff --git a/api/system-current.txt b/api/system-current.txt
index b27c5f012978..c7a05b2cd826 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12726,6 +12726,7 @@ package android.graphics {
method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public float[] approximate(float);
method public void arcTo(android.graphics.RectF, float, float, boolean);
method public void arcTo(android.graphics.RectF, float, float);
method public void arcTo(float, float, float, float, float, float, boolean);
diff --git a/api/test-current.txt b/api/test-current.txt
index 9bb1a7dc7182..881d290536c5 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -12309,6 +12309,7 @@ package android.graphics {
method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public float[] approximate(float);
method public void arcTo(android.graphics.RectF, float, float, boolean);
method public void arcTo(android.graphics.RectF, float, float);
method public void arcTo(float, float, float, float, float, float, boolean);
diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java
index be31bbe0c086..2294b862192d 100644
--- a/graphics/java/android/graphics/Path.java
+++ b/graphics/java/android/graphics/Path.java
@@ -800,7 +800,6 @@ public class Path {
* Path. Typically this would be 0.5 so that
* the error is less than half a pixel.
* @return An array of components for points approximating the Path.
- * @hide
*/
public float[] approximate(float acceptableError) {
return native_approximate(mNativePath, acceptableError);