diff options
| author | Jim Miller <jaggies@google.com> | 2011-07-20 15:19:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-20 15:19:19 -0700 |
| commit | 83261239b07e1f3d2989bb4957e6a0e97c40a157 (patch) | |
| tree | a7c047cd5ffbffce0a4dd9677f6789260d1cfceb /core/java/android/widget/GridLayout.java | |
| parent | f0e85d3af84012aeb6fb5583d943b1ea3cb31ad5 (diff) | |
| parent | 6235b47cba0eddd0662eefc5218377c478036279 (diff) | |
Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views."
Diffstat (limited to 'core/java/android/widget/GridLayout.java')
| -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 5747fd334494..3bd7fabe9ec7 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -596,7 +596,6 @@ public class GridLayout extends ViewGroup { int col = 0; for (int i = 0, N = getChildCount(); i < N; i++) { View c = getChildAt(i); - if (isGone(c)) continue; LayoutParams lp = getLayoutParams1(c); final Spec colSpec = lp.columnSpec; @@ -1002,7 +1001,6 @@ public class GridLayout extends ViewGroup { int count = -1; for (int i = 0, N = getChildCount(); i < N; i++) { View c = getChildAt(i); - if (isGone(c)) continue; LayoutParams params = getLayoutParams(c); Spec spec = horizontal ? params.columnSpec : params.rowSpec; count = max(count, spec.span.min); |