aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Anthony <nickanthony@google.com>2019-06-24 21:49:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-06-24 21:49:39 +0000
commitfbea2ca7847166ddb256244269ebeb5623b47434 (patch)
tree37abe5df860eb7e53ed23dbeff45c3ad9c327651
parentbb7331a8daf9029191b5a2239a44d38672e564b1 (diff)
parentf9b2f91a3f91561b19c57efc84710ec995d5fc45 (diff)
downloadsupport-fbea2ca7847166ddb256244269ebeb5623b47434.tar.gz
Merge "Update vectordrawable to 1.1.0-rc01" into androidx-master-dev
-rw-r--r--buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt4
-rw-r--r--graphics/drawable/animated/api/1.1.0-rc01.txt36
-rw-r--r--graphics/drawable/animated/api/res-1.1.0-rc01.txt0
-rw-r--r--graphics/drawable/animated/api/restricted_1.1.0-rc01.txt29
-rw-r--r--graphics/drawable/static/api/1.1.0-rc01.txt15
-rw-r--r--graphics/drawable/static/api/res-1.1.0-rc01.txt0
-rw-r--r--graphics/drawable/static/api/restricted_1.1.0-rc01.txt9
7 files changed, 91 insertions, 2 deletions
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index abd85923a68..a6a1e7e33f1 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -101,8 +101,8 @@ object LibraryVersions {
val TRANSITION = Version("1.2.0-alpha02")
val TVPROVIDER = Version("1.1.0-alpha01")
val UI = Version("1.0.0-alpha01")
- val VECTORDRAWABLE = Version("1.1.0-beta03")
- val VECTORDRAWABLE_ANIMATED = Version("1.1.0-beta03")
+ val VECTORDRAWABLE = Version("1.1.0-rc01")
+ val VECTORDRAWABLE_ANIMATED = Version("1.1.0-rc01")
val VERSIONED_PARCELABLE = Version("1.2.0-alpha01")
val VIEWPAGER = Version("1.1.0-alpha01")
val VIEWPAGER2 = Version("1.0.0-alpha06")
diff --git a/graphics/drawable/animated/api/1.1.0-rc01.txt b/graphics/drawable/animated/api/1.1.0-rc01.txt
new file mode 100644
index 00000000000..70c9c237959
--- /dev/null
+++ b/graphics/drawable/animated/api/1.1.0-rc01.txt
@@ -0,0 +1,36 @@
+// Signature format: 3.0
+package androidx.vectordrawable.graphics.drawable {
+
+ public interface Animatable2Compat extends android.graphics.drawable.Animatable {
+ method public void clearAnimationCallbacks();
+ method public void registerAnimationCallback(androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback);
+ method public boolean unregisterAnimationCallback(androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback);
+ }
+
+ public abstract static class Animatable2Compat.AnimationCallback {
+ ctor public Animatable2Compat.AnimationCallback();
+ method public void onAnimationEnd(android.graphics.drawable.Drawable!);
+ method public void onAnimationStart(android.graphics.drawable.Drawable!);
+ }
+
+ public class AnimatedVectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.vectordrawable.graphics.drawable.Animatable2Compat androidx.core.graphics.drawable.TintAwareDrawable {
+ method public void clearAnimationCallbacks();
+ method public static void clearAnimationCallbacks(android.graphics.drawable.Drawable!);
+ method public static androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat? create(android.content.Context, @DrawableRes int);
+ method public static androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat! createFromXmlInner(android.content.Context!, android.content.res.Resources!, org.xmlpull.v1.XmlPullParser!, android.util.AttributeSet!, android.content.res.Resources.Theme!) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public void draw(android.graphics.Canvas!);
+ method public int getOpacity();
+ method public boolean isRunning();
+ method public void registerAnimationCallback(androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback);
+ method public static void registerAnimationCallback(android.graphics.drawable.Drawable!, androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback!);
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter!);
+ method public void setColorFilter(int, android.graphics.PorterDuff.Mode!);
+ method public void start();
+ method public void stop();
+ method public boolean unregisterAnimationCallback(androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback);
+ method public static boolean unregisterAnimationCallback(android.graphics.drawable.Drawable!, androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback!);
+ }
+
+}
+
diff --git a/graphics/drawable/animated/api/res-1.1.0-rc01.txt b/graphics/drawable/animated/api/res-1.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/graphics/drawable/animated/api/res-1.1.0-rc01.txt
diff --git a/graphics/drawable/animated/api/restricted_1.1.0-rc01.txt b/graphics/drawable/animated/api/restricted_1.1.0-rc01.txt
new file mode 100644
index 00000000000..ceab395d9b4
--- /dev/null
+++ b/graphics/drawable/animated/api/restricted_1.1.0-rc01.txt
@@ -0,0 +1,29 @@
+// Signature format: 3.0
+package androidx.vectordrawable.graphics.drawable {
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class AnimationUtilsCompat {
+ method public static android.view.animation.Interpolator! loadInterpolator(android.content.Context!, int) throws android.content.res.Resources.NotFoundException;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class AnimatorInflaterCompat {
+ method public static android.animation.Animator! loadAnimator(android.content.Context!, @AnimatorRes int) throws android.content.res.Resources.NotFoundException;
+ method public static android.animation.Animator! loadAnimator(android.content.Context!, android.content.res.Resources!, android.content.res.Resources.Theme!, @AnimatorRes int) throws android.content.res.Resources.NotFoundException;
+ method public static android.animation.Animator! loadAnimator(android.content.Context!, android.content.res.Resources!, android.content.res.Resources.Theme!, @AnimatorRes int, float) throws android.content.res.Resources.NotFoundException;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ArgbEvaluator implements android.animation.TypeEvaluator {
+ ctor public ArgbEvaluator();
+ method public Object! evaluate(float, Object!, Object!);
+ method public static androidx.vectordrawable.graphics.drawable.ArgbEvaluator! getInstance();
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class PathInterpolatorCompat implements android.view.animation.Interpolator {
+ ctor public PathInterpolatorCompat(android.content.Context!, android.util.AttributeSet!, org.xmlpull.v1.XmlPullParser!);
+ ctor public PathInterpolatorCompat(android.content.res.Resources!, android.content.res.Resources.Theme!, android.util.AttributeSet!, org.xmlpull.v1.XmlPullParser!);
+ method public float getInterpolation(float);
+ field public static final double EPSILON = 1.0E-5;
+ field public static final int MAX_NUM_POINTS = 3000; // 0xbb8
+ }
+
+}
+
diff --git a/graphics/drawable/static/api/1.1.0-rc01.txt b/graphics/drawable/static/api/1.1.0-rc01.txt
new file mode 100644
index 00000000000..34cf29770bc
--- /dev/null
+++ b/graphics/drawable/static/api/1.1.0-rc01.txt
@@ -0,0 +1,15 @@
+// Signature format: 3.0
+package androidx.vectordrawable.graphics.drawable {
+
+ public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
+ method public static androidx.vectordrawable.graphics.drawable.VectorDrawableCompat? create(android.content.res.Resources, @DrawableRes int, android.content.res.Resources.Theme?);
+ method public static androidx.vectordrawable.graphics.drawable.VectorDrawableCompat! createFromXmlInner(android.content.res.Resources!, org.xmlpull.v1.XmlPullParser!, android.util.AttributeSet!, android.content.res.Resources.Theme!) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ 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 setColorFilter(int, android.graphics.PorterDuff.Mode!);
+ }
+
+}
+
diff --git a/graphics/drawable/static/api/res-1.1.0-rc01.txt b/graphics/drawable/static/api/res-1.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/graphics/drawable/static/api/res-1.1.0-rc01.txt
diff --git a/graphics/drawable/static/api/restricted_1.1.0-rc01.txt b/graphics/drawable/static/api/restricted_1.1.0-rc01.txt
new file mode 100644
index 00000000000..dadafcd9e79
--- /dev/null
+++ b/graphics/drawable/static/api/restricted_1.1.0-rc01.txt
@@ -0,0 +1,9 @@
+// Signature format: 3.0
+package androidx.vectordrawable.graphics.drawable {
+
+ public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public float getPixelSize();
+ }
+
+}
+