diff options
author | Romain Guy <romainguy@google.com> | 2013-05-25 00:38:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-25 00:38:26 +0000 |
commit | 529a9e391e386aac37ea722d2517d376968b3d31 (patch) | |
tree | 20b9a45d872044b3332ff22ea83a5a1ce2bf48ea /graphics/java | |
parent | eebec7b1fe68cef9c4feed1f56af2592b402a629 (diff) | |
parent | 90e10cc58690678937575b54e1b20b899445d0e4 (diff) | |
download | frameworks_base-529a9e391e386aac37ea722d2517d376968b3d31.zip frameworks_base-529a9e391e386aac37ea722d2517d376968b3d31.tar.gz frameworks_base-529a9e391e386aac37ea722d2517d376968b3d31.tar.bz2 |
Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/drawable/LayerDrawable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 09b3eac..6b59dba 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -575,7 +575,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { @Override public Drawable mutate() { if (!mMutated && super.mutate() == this) { - mLayerState = new LayerState(mLayerState, this, null); + mLayerState = createConstantState(mLayerState, null); final ChildDrawable[] array = mLayerState.mChildren; final int N = mLayerState.mNum; for (int i = 0; i < N; i++) { |