summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-11-10 22:02:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-10 22:02:20 -0800
commit3105b6d2f192fc25f57911ef7bafbd62bae5b7e3 (patch)
tree0186a7ef1cd8130aa1a7c1ddbda98b3696646e14 /core/java
parentf32962a878d8434a9c440576af79350ddb3dc2f6 (diff)
parent12c32b4d484cc7cc2278a76c6e0fc2304a74b593 (diff)
am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '12c32b4d484cc7cc2278a76c6e0fc2304a74b593': Make quick settings show the standard media router icon.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/ImageView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 9e35a236fdec..7daf798194fb 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -710,6 +710,7 @@ public class ImageView extends View {
}
d.setLevel(mLevel);
d.setLayoutDirection(getLayoutDirection());
+ d.setVisible(getVisibility() == VISIBLE, true);
mDrawableWidth = d.getIntrinsicWidth();
mDrawableHeight = d.getIntrinsicHeight();
applyColorMod();