Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dispatch aggregated visibility when performing attachViewToParent" into nyc-dev

Browse Source
This commit is contained in:
Adam Powell
2016-03-18 01:12:57 +00:00
committed by Android (Google) Code Review
parent 836ed4a582 c5874094eb
commit a17fa708e7
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewGroup.java
View File

@@ -4994,6 +4994,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
if (child.hasFocus()) { if (child.hasFocus()) {
requestChildFocus(child, child.findFocus()); requestChildFocus(child, child.findFocus());
} }
dispatchVisibilityAggregated(isAttachedToWindow() && getWindowVisibility() == VISIBLE
&& isShown());
} }
/** /**

9
core/java/android/widget/ImageView.java
View File

@@ -913,7 +913,9 @@ public class ImageView extends View {
if (mDrawable != null) { if (mDrawable != null) {
mDrawable.setCallback(null); mDrawable.setCallback(null);
unscheduleDrawable(mDrawable); unscheduleDrawable(mDrawable);
mDrawable.setVisible(false, false); if (isAttachedToWindow()) {
mDrawable.setVisible(false, false);
}
} }
mDrawable = d; mDrawable = d;
@@ -924,8 +926,9 @@ public class ImageView extends View {
if (d.isStateful()) { if (d.isStateful()) {
d.setState(getDrawableState()); d.setState(getDrawableState());
} }
d.setVisible(isAttachedToWindow() && getWindowVisibility() == VISIBLE && isShown(), if (isAttachedToWindow()) {
true); d.setVisible(getWindowVisibility() == VISIBLE && isShown(), true);
}
d.setLevel(mLevel); d.setLevel(mLevel);
mDrawableWidth = d.getIntrinsicWidth(); mDrawableWidth = d.getIntrinsicWidth();
mDrawableHeight = d.getIntrinsicHeight(); mDrawableHeight = d.getIntrinsicHeight();