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

Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""

Browse Source 
Suspected cause of: http://b.corp.google.com/issue?id=8192858

This reverts commit e5e0b7f191

Change-Id: I1a35c12c3ca0b1eacfb0c1a4d6ba03601dab664b
This commit is contained in:
Philip Milne
2013-02-13 22:07:50 +00:00
committed by The Android Automerger
parent 6ce9c6554a
commit 03dde4b9e0
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/GridLayout.java
View File

@@ -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);