summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/FrameLayout.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-10-28 14:41:36 -0700
committerAlan Viverette <alanv@google.com>2014-10-29 19:46:54 +0000
commitd5133792391443521dc15f7da7de5d280e6703dd (patch)
tree61dfd88ec02dc4ff1afe499c2c4e918fa990d8ae /core/java/android/widget/FrameLayout.java
parente2502eb9ad5eafc54ae06f06a72493748616dbd5 (diff)
downloadframeworks_base-d5133792391443521dc15f7da7de5d280e6703dd.zip
frameworks_base-d5133792391443521dc15f7da7de5d280e6703dd.tar.gz
frameworks_base-d5133792391443521dc15f7da7de5d280e6703dd.tar.bz2
Update drawable state after updating tint list
BUG: 18155988 Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
-rw-r--r--core/java/android/widget/FrameLayout.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
index e317524..d974c29 100644
--- a/core/java/android/widget/FrameLayout.java
+++ b/core/java/android/widget/FrameLayout.java
@@ -384,6 +384,12 @@ public class FrameLayout extends ViewGroup {
if (mHasForegroundTintMode) {
mForeground.setTintMode(mForegroundTintMode);
}
+
+ // The drawable (or one of its children) may not have been
+ // stateful before applying the tint, so let's try again.
+ if (mForeground.isStateful()) {
+ mForeground.setState(getDrawableState());
+ }
}
}