Merge "Always mutate child when added to drawable container" into nyc-dev (d1f686f5) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/DrawableContainer.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -786,13 +786,19 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
		return mChangingConfigurations \| mChildrenChangingConfigurations;
		}

		/**
		* Adds the drawable to the end of the list of contained drawables.
		*
		* @param dr the drawable to add
		* @return the position of the drawable within the container
		*/
		public final int addChild(Drawable dr) {
		final int pos = mNumChildren;

		if (pos >= mDrawables.length) {
		growArray(pos, pos+10);
		}

		dr.mutate();
		dr.setVisible(false, true);
		dr.setCallback(mOwner);