Merge "Always mutate child when added to drawable container" into nyc-dev

This commit is contained in:
Alan Viverette
2016-05-09 14:06:51 +00:00
committed by Android (Google) Code Review

View File

@@ -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);