Always report visibility to new ImageView drawables am: 37b44dd592

am: a35c182637 Change-Id: Iff4507bf0607d33d9525c8695260f75b381a7ba8
2016-08-24 23:18:47 +00:00
parent dbd604106b a35c182637
commit 3c5b0dffe3
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -933,9 +933,8 @@ public class ImageView extends View {
            if (d.isStateful()) {
                d.setState(getDrawableState());
            }
-            if (isAttachedToWindow()) {
-                d.setVisible(getWindowVisibility() == VISIBLE && isShown(), true);
-            }
+            d.setVisible(isAttachedToWindow() && getWindowVisibility() == VISIBLE && isShown(),
+                    true);
            d.setLevel(mLevel);
            mDrawableWidth = d.getIntrinsicWidth();
            mDrawableHeight = d.getIntrinsicHeight();