diff options
| author | Chris Craik <ccraik@google.com> | 2015-06-30 13:51:25 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-06-30 13:51:26 -0700 |
| commit | a1dab8bb0ff325bcb09129cb7ae5df36e76d7459 (patch) | |
| tree | 38a52eaff56d0e18b5cfef90ce55f9c327c45889 /core | |
| parent | 82b3f67711246ad5beaf7702ce16e9d433406d1e (diff) | |
Don't display layout bounds of GONE views
bug:22126532
Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index b53d93ca372d..6dca26b18f26 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3236,13 +3236,15 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager for (int i = 0; i < getChildCount(); i++) { View c = getChildAt(i); - Insets insets = c.getOpticalInsets(); - - drawRect(canvas, paint, - c.getLeft() + insets.left, - c.getTop() + insets.top, - c.getRight() - insets.right - 1, - c.getBottom() - insets.bottom - 1); + if (c.getVisibility() != View.GONE) { + Insets insets = c.getOpticalInsets(); + + drawRect(canvas, paint, + c.getLeft() + insets.left, + c.getTop() + insets.top, + c.getRight() - insets.right - 1, + c.getBottom() - insets.bottom - 1); + } } } @@ -3263,8 +3265,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager int lineWidth = dipsToPixels(1); for (int i = 0; i < getChildCount(); i++) { View c = getChildAt(i); - drawRectCorners(canvas, c.getLeft(), c.getTop(), c.getRight(), c.getBottom(), - paint, lineLength, lineWidth); + if (c.getVisibility() != View.GONE) { + drawRectCorners(canvas, c.getLeft(), c.getTop(), c.getRight(), c.getBottom(), + paint, lineLength, lineWidth); + } } } } |