summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-05-20 17:45:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-20 17:45:52 +0000
commitf31512eb17b6327c5f81bfb8a69c3a6119a0dd66 (patch)
treef943aef163183fb7727f3864fb8ba67a05d35634 /api
parentb5eb843e4b7c56259e2609e2e668bf5a4cd51f42 (diff)
parente5b082d6eb0489e7dbe3159338f8c94c0af61dee (diff)
downloadframeworks_base-f31512eb17b6327c5f81bfb8a69c3a6119a0dd66.zip
frameworks_base-f31512eb17b6327c5f81bfb8a69c3a6119a0dd66.tar.gz
frameworks_base-f31512eb17b6327c5f81bfb8a69c3a6119a0dd66.tar.bz2
Merge "Various API council fixes to drawables"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt11
1 files changed, 1 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt
index 5f8b90c..5feccd4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -864,6 +864,7 @@ package android {
field public static final int paddingBottom = 16842969; // 0x10100d9
field public static final int paddingEnd = 16843700; // 0x10103b4
field public static final int paddingLeft = 16842966; // 0x10100d6
+ field public static final int paddingMode = 16843866; // 0x101045a
field public static final int paddingRight = 16842968; // 0x10100d8
field public static final int paddingStart = 16843699; // 0x10103b3
field public static final int paddingTop = 16842967; // 0x10100d7
@@ -11412,16 +11413,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 {