diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-08 13:55:55 -0800 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-11-09 18:59:46 -0800 |
| commit | e2126baf72f007d079efcabd45c7a546db34361a (patch) | |
| tree | 6e9b13039a34fbba67d6a0025d246dc1ba8e8a51 /core | |
| parent | ed7376fc4829e93f5f2d3037633a37d652a13a7c (diff) | |
| download | frameworks_base-e2126baf72f007d079efcabd45c7a546db34361a.zip frameworks_base-e2126baf72f007d079efcabd45c7a546db34361a.tar.gz frameworks_base-e2126baf72f007d079efcabd45c7a546db34361a.tar.bz2 | |
Make quick settings show the standard media router icon.
Fixed a bug in ImageView where we failed to inform a newly updated
Drawable about the visibility state. This caused AnimationDrawables
to not animate when attached to an existing ImageView *unless* that
ImageView happened to be attached to the window *later* or have
its visibility toggled for some other reason.
Bug: 11257292
Change-Id: Iba9e0db5ba0db2b022950aec0c6f60a435da8ad2
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 1 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 9e35a23..7daf798 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(); diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b85bff4..8387c9d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1096,6 +1096,8 @@ <java-symbol type="drawable" name="notification_template_icon_bg" /> <java-symbol type="drawable" name="notification_template_icon_low_bg" /> <java-symbol type="drawable" name="ic_media_route_on_holo_dark" /> + <java-symbol type="drawable" name="ic_media_route_off_holo_dark" /> + <java-symbol type="drawable" name="ic_media_route_connecting_holo_dark" /> <java-symbol type="drawable" name="ic_media_route_disabled_holo_dark" /> <java-symbol type="drawable" name="cling_button" /> <java-symbol type="drawable" name="cling_arrow_up" /> |