Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alan Viverette
2016-05-09 14:06:51 +00:00
committed by Android (Google) Code Review
parent d8c38b892b a24c9b4791
commit d1f686f5dc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -786,13 +786,19 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
return mChangingConfigurations | mChildrenChangingConfigurations; 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) { public final int addChild(Drawable dr) {
final int pos = mNumChildren; final int pos = mNumChildren;
if (pos >= mDrawables.length) { if (pos >= mDrawables.length) {
growArray(pos, pos+10); growArray(pos, pos+10);
} }
dr.mutate();
dr.setVisible(false, true); dr.setVisible(false, true);
dr.setCallback(mOwner); dr.setCallback(mOwner);