summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2014-05-27 16:09:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 16:09:05 +0000
commit427a15a0f0d3d2a244348c2d572a44bca3035fd9 (patch)
tree9ff45b8245074e959d843e2b280f39e0e6303304
parenta33ea18dc6fc6f4f4978aff57f7d6a0d0feb93d4 (diff)
parent72da16382161adbbd44dfb9d175e1bb13a8f9f0c (diff)
downloadframeworks_base-427a15a0f0d3d2a244348c2d572a44bca3035fd9.zip
frameworks_base-427a15a0f0d3d2a244348c2d572a44bca3035fd9.tar.gz
frameworks_base-427a15a0f0d3d2a244348c2d572a44bca3035fd9.tar.bz2
Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev
-rw-r--r--api/current.txt10
-rw-r--r--graphics/java/android/graphics/drawable/VectorDrawable.java1
2 files changed, 1 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt
index 3720f1d..812dfc4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11570,16 +11570,6 @@ package android.graphics.drawable {
method public void startTransition(int);
}
- public class VectorDrawable extends android.graphics.drawable.Drawable {
- ctor public VectorDrawable();
- method public void draw(android.graphics.Canvas);
- method public int getOpacity();
- method public void setAlpha(int);
- method public void setColorFilter(android.graphics.ColorFilter);
- method public void setPadding(android.graphics.Rect);
- method public void setPadding(int, int, int, int);
- }
-
}
package android.graphics.drawable.shapes {
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index e2bd50d..9a63fa3 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -101,6 +101,7 @@ import java.util.HashMap;
* <dd>Sets the Miter limit for a stroked path</dd></dt>
* </dl>
* </dd>
+ * @hide
*/
public class VectorDrawable extends Drawable {
private static final String LOGTAG = VectorDrawable.class.getSimpleName();