diff options
| author | Philip Milne <pmilne@google.com> | 2013-02-13 22:23:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 22:23:45 +0000 |
| commit | fd0fa65eeae00f58863af060950e10f20971726b (patch) | |
| tree | 60d0106f2233560be6cb6b83ea12b5a91dbe7fa2 /core | |
| parent | 68b600913b699da0fbfcd9d913e4c4fdb08e06b8 (diff) | |
| parent | 57ce47134a088f84b63f8e7cc8d618807201aadd (diff) | |
| download | frameworks_base-fd0fa65eeae00f58863af060950e10f20971726b.zip frameworks_base-fd0fa65eeae00f58863af060950e10f20971726b.tar.gz frameworks_base-fd0fa65eeae00f58863af060950e10f20971726b.tar.bz2 | |
Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"""
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/GridLayout.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index 12cce8b..85ed8db 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -1235,7 +1235,6 @@ public class GridLayout extends ViewGroup { Assoc<Spec, Bounds> assoc = Assoc.of(Spec.class, Bounds.class); for (int i = 0, N = getChildCount(); i < N; i++) { View c = getChildAt(i); - if (c.getVisibility() == View.GONE) continue; LayoutParams lp = getLayoutParams(c); Spec spec = horizontal ? lp.columnSpec : lp.rowSpec; Bounds bounds = getAlignment(spec.alignment, horizontal).getBounds(); @@ -1251,7 +1250,6 @@ public class GridLayout extends ViewGroup { } for (int i = 0, N = getChildCount(); i < N; i++) { View c = getChildAt(i); - if (c.getVisibility() == View.GONE) continue; LayoutParams lp = getLayoutParams(c); Spec spec = horizontal ? lp.columnSpec : lp.rowSpec; groupBounds.getValue(i).include(GridLayout.this, c, spec, this); |