diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-11 15:23:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-11 15:23:40 -0800 |
| commit | 7117c0c184b02d703f2a8612b2d253e44999cbfb (patch) | |
| tree | 5c38f84248878fe1c73f2db5a54ab2539573e37e /core/java/android/widget/ImageView.java | |
| parent | 19001d29bd37b0467ff37116edcefadd259c0a5a (diff) | |
| parent | 40c81e4a5d96f8a3853045b289f6131c44d3155d (diff) | |
| download | frameworks_base-7117c0c184b02d703f2a8612b2d253e44999cbfb.zip frameworks_base-7117c0c184b02d703f2a8612b2d253e44999cbfb.tar.gz frameworks_base-7117c0c184b02d703f2a8612b2d253e44999cbfb.tar.bz2 | |
am 40c81e4a: am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '40c81e4a5d96f8a3853045b289f6131c44d3155d':
Make quick settings show the standard media router icon.
Diffstat (limited to 'core/java/android/widget/ImageView.java')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index cfd7e4a..79d5e5d 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -715,6 +715,7 @@ public class ImageView extends View { } d.setLevel(mLevel); d.setLayoutDirection(getLayoutDirection()); + d.setVisible(getVisibility() == VISIBLE, true); mDrawableWidth = d.getIntrinsicWidth(); mDrawableHeight = d.getIntrinsicHeight(); applyColorMod(); |