Merge "Always mutate child when added to drawable container" into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d1f686f5dc
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user