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

am 20d54457: am ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev

Browse Source 
* commit '20d544571168cad62db4d86c91b3dfde7c13a342':
  Don't display layout bounds of GONE views
This commit is contained in:
Chris Craik
2015-06-30 21:40:51 +00:00
committed by Android Git Automerger
parent fe7b878ff5 20d5445711
commit bfb3afcad9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3236,13 +3236,15 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {
View c = getChildAt(i); View c = getChildAt(i);
Insets insets = c.getOpticalInsets(); if (c.getVisibility() != View.GONE) {
Insets insets = c.getOpticalInsets();
drawRect(canvas, paint, drawRect(canvas, paint,
c.getLeft() + insets.left, c.getLeft() + insets.left,
c.getTop() + insets.top, c.getTop() + insets.top,
c.getRight() - insets.right - 1, c.getRight() - insets.right - 1,
c.getBottom() - insets.bottom - 1); c.getBottom() - insets.bottom - 1);
}
} }
} }
@@ -3263,8 +3265,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
int lineWidth = dipsToPixels(1); int lineWidth = dipsToPixels(1);
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {
View c = getChildAt(i); View c = getChildAt(i);
drawRectCorners(canvas, c.getLeft(), c.getTop(), c.getRight(), c.getBottom(), if (c.getVisibility() != View.GONE) {
paint, lineLength, lineWidth); drawRectCorners(canvas, c.getLeft(), c.getTop(), c.getRight(), c.getBottom(),
paint, lineLength, lineWidth);
}
} }
} }
} }