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

Commit c5874094 authored by Adam Powell's avatar Adam Powell
Browse files

Dispatch aggregated visibility when performing attachViewToParent 

attachViewToParent is generally used for finishing a temporary detach
of a view as seen in ListView, etc. Have it dispatch aggregated
visibility to the newly added view so as to correctly update the view
as to its new state.

Bug 27702014

Change-Id: Ie8a67c78d3edf401641d52ce10bddf7cb49796fe
parent ce71deef

core/java/android/view/ViewGroup.java

+2 −0
Original line number Diff line number Diff line
@@ -4994,6 +4994,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        if (child.hasFocus()) {

            requestChildFocus(child, child.findFocus());

        }

        dispatchVisibilityAggregated(isAttachedToWindow() && getWindowVisibility() == VISIBLE

                && isShown());

    }



    /**

core/java/android/widget/ImageView.java

+6 −3
Original line number Diff line number Diff line
@@ -913,8 +913,10 @@ public class ImageView extends View { 
        if (mDrawable != null) {

            mDrawable.setCallback(null);

            unscheduleDrawable(mDrawable);

            if (isAttachedToWindow()) {

                mDrawable.setVisible(false, false);

            }

        }



        mDrawable = d;
@@ -924,8 +926,9 @@ public class ImageView extends View { 
            if (d.isStateful()) {

                d.setState(getDrawableState());

            }

            d.setVisible(isAttachedToWindow() && getWindowVisibility() == VISIBLE && isShown(),

                    true);

            if (isAttachedToWindow()) {

                d.setVisible(getWindowVisibility() == VISIBLE && isShown(), true);

            }

            d.setLevel(mLevel);

            mDrawableWidth = d.getIntrinsicWidth();

            mDrawableHeight = d.getIntrinsicHeight();