Merge "Dispatch aggregated visibility when performing attachViewToParent" into nyc-dev (a17fa708) · Commits · e / os / android_frameworks_base

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());
		}

		/**

+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();