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

Merge " Update to fix for bug 5393156" into ics-mr1

Browse Source
This commit is contained in:
Philip Milne
2011-11-01 09:30:21 -07:00
committed by Android (Google) Code Review
parent 2272602032 6b248641fc
commit 3617933bee
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -867,16 +867,18 @@ public class GridLayout extends ViewGroup {
if (firstPass) {
measureChildWithMargins2(c, widthSpec, heightSpec, lp.width, lp.height);
} else {
Spec spec = (orientation == HORIZONTAL) ? lp.columnSpec : lp.rowSpec;
boolean horizontal = (orientation == HORIZONTAL);
Spec spec = horizontal ? lp.columnSpec : lp.rowSpec;
if (spec.alignment == FILL) {
Interval span = spec.span;
Axis axis = (orientation == HORIZONTAL) ? horizontalAxis : verticalAxis;
Axis axis = horizontal ? horizontalAxis : verticalAxis;
int[] locations = axis.getLocations();
int size = locations[span.max] - locations[span.min];
if (orientation == HORIZONTAL) {
measureChildWithMargins2(c, widthSpec, heightSpec, size, lp.height);
int cellSize = locations[span.max] - locations[span.min];
int viewSize = cellSize - getTotalMargin(c, horizontal);
if (horizontal) {
measureChildWithMargins2(c, widthSpec, heightSpec, viewSize, lp.height);
} else {
measureChildWithMargins2(c, widthSpec, heightSpec, lp.width, size);
measureChildWithMargins2(c, widthSpec, heightSpec, lp.width, viewSize);
}
}
}