Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b44dd5 authored by Adam Powell's avatar Adam Powell
Browse files

Always report visibility to new ImageView drawables 

Fix a regression where some drawables would not be correctly updated
with their visibility state if set while an ImageView was not attached
to a window.

Bug 30216207

Change-Id: Ia30326a78168141c8f85bad9c782710f965623b7
parent e9c519e0

core/java/android/widget/ImageView.java

+2 −3
Original line number Diff line number Diff line
@@ -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();