summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorCraig Stout <cstout@google.com>2014-03-31 19:08:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-31 19:08:24 +0000
commitfe710551cfd98ce90f331e3b9a240d46f303f7b1 (patch)
treeb3cf8ad96fd86db173b2769eb8240590ff511ae1 /graphics
parent56a8f8b48ff1d0855209307b9076d6e9b348b59b (diff)
parentecaea7e60c0992ac295163f55c1f986a46eef008 (diff)
downloadframeworks_base-fe710551cfd98ce90f331e3b9a240d46f303f7b1.zip
frameworks_base-fe710551cfd98ce90f331e3b9a240d46f303f7b1.tar.gz
frameworks_base-fe710551cfd98ce90f331e3b9a240d46f303f7b1.tar.bz2
am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
* commit 'ecaea7e60c0992ac295163f55c1f986a46eef008': Force refresh of stateful when a child drawable is changed.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/LayerDrawable.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index 81cc11b..2ea9b8e 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -295,6 +295,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
drawable.setCallback(this);
}
layers[i].mDrawable = drawable;
+ mLayerState.mHaveStateful = false;
return true;
}
}