Merge "Minor doc fixes from API council recommendations." into lmp-dev (a4888fba) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -11654,7 +11654,7 @@ package android.graphics.drawable {
		public class AnimatedStateListDrawable extends android.graphics.drawable.StateListDrawable {
		ctor public AnimatedStateListDrawable();
		method public void addState(int[], android.graphics.drawable.Drawable, int);
		method public void addTransition(int, int, android.graphics.drawable.Drawable, boolean);
		method public void addTransition(int, int, T, boolean);
		}

		public class AnimatedVectorDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Animatable {

+3 −3

Original line number	Diff line number	Diff line
		@@ -119,11 +119,11 @@ public class AnimatedStateListDrawable extends StateListDrawable {
		*
		* @param fromId Unique identifier of the starting keyframe
		* @param toId Unique identifier of the ending keyframe
		* @param transition An animatable drawable to use as a transition, may not be null
		* @param transition An {@link Animatable} drawable to use as a transition, may not be null
		* @param reversible Whether the transition can be reversed
		*/
		public void addTransition(int fromId, int toId, @NonNull Drawable transition,
		boolean reversible) {
		public <T extends Drawable & Animatable> void addTransition(int fromId, int toId,
		@NonNull T transition, boolean reversible) {
		if (transition == null) {
		throw new IllegalArgumentException("Transition drawable must not be null");
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ import java.util.ArrayList;
		import java.util.Stack;

		/**
		* This lets you create a drawable based on an XML vector graphic It can be
		* This lets you create a drawable based on an XML vector graphic. It can be
		* defined in an XML file with the <code><vector></code> element.
		* <p/>
		* The vector drawable has the following elements:

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.graphics.drawable.shapes;

		import android.annotation.NonNull;
		import android.graphics.Canvas;
		import android.graphics.Outline;
		import android.graphics.Paint;
		@@ -93,11 +94,12 @@ public abstract class Shape implements Cloneable {
		protected void onResize(float width, float height) {}

		/**
		* Compute the Outline of the shape.
		* Compute the Outline of the shape and return it in the supplied Outline
		* parameter. The default implementation does nothing and {@code outline} is not changed.
		*
		* The default implementation does not supply an outline.
		* @param outline The Outline to be populated with the result. Should not be null.
		*/
		public void getOutline(Outline outline) {}
		public void getOutline(@NonNull Outline outline) {}

		@Override
		public Shape clone() throws CloneNotSupportedException {