Always report visibility to new ImageView drawables

am: 37b44dd592 Change-Id: Ib8e1cc5d3ee91aae74875cc70fda9d8d4104892e
2016-08-24 23:12:27 +00:00
parent 333680114d 37b44dd592
commit a35c182637
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();