diff options
| author | Jim Miller <jaggies@google.com> | 2011-07-20 15:01:06 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-07-20 15:13:49 -0700 |
| commit | 6235b47cba0eddd0662eefc5218377c478036279 (patch) | |
| tree | e34ef1cb6782e3f617509ea0b3d004debd34417d /core | |
| parent | 054d5c5740fd422c369e65b56d876fb111313f52 (diff) | |
| download | frameworks_base-6235b47cba0eddd0662eefc5218377c478036279.zip frameworks_base-6235b47cba0eddd0662eefc5218377c478036279.tar.gz frameworks_base-6235b47cba0eddd0662eefc5218377c478036279.tar.bz2 | |
Fix 5056699: GridLayout should maintain static indices for "gone" views.
GridLayout currently ignores views with visibility="gone" when accounting for rows/columns.
Instead it should count views with visibility="gone" as rows/columns with row/height equal to 0.
This also makes it consistent with other ViewGroups like LinearLayout where "gone" views
don't change order and are still present (but hidden) within a container.
Change-Id: I289d4ee6275d5b49b1e1d79985484216bbf48089
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 b9eb5ff..d9e5aef 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); |