Merge "Make AnimatedVectorDrawable public."

diff --cc api/current.txt
Simple merge

diff --cc graphics/java/android/graphics/drawable/VectorDrawable.java
index 3773a9b,001a007..c98f2a1
--- 1/graphics/java/android/graphics/drawable/VectorDrawable.java
--- 2/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@@ -276,16 -248,13 +248,6 @@@ public class VectorDrawable extends Dra
      }
  
      @Override
-     public boolean getPadding(Rect padding) {
-         if (mVectorState.mPadding != null) {
-             padding.set(mVectorState.mPadding);
-             return true;
-         } else {
-             return super.getPadding(padding);
-         }
 -    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)
 -            throws XmlPullParserException, IOException {
 -        final VPathRenderer p = inflateInternal(res, parser, attrs, theme);
 -        setPathRenderer(p);
--    }
--
--    @Override
      public boolean canApplyTheme() {
          return super.canApplyTheme() || mVectorState != null && mVectorState.canApplyTheme();
      }
@@@ -458,11 -397,13 +420,10 @@@
          }
      }
  
 -    private void setPathRenderer(VPathRenderer pathRenderer) {
 -        mVectorState.mVPathRenderer = pathRenderer;
 -    }
 -
      private static class VectorDrawableState extends ConstantState {
 +        int[] mThemeAttrs;
          int mChangingConfigurations;
          VPathRenderer mVPathRenderer;
-         Rect mPadding;
          ColorStateList mTint;
          Mode mTintMode;