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

am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev

Browse Source 
* commit '1771ee34d1d308193e61a1b75368149f2d06aa6c':
  Revert "Fix for layout parameter validation bug in GridLayout."
This commit is contained in:
Jim Miller
2012-05-02 16:02:38 -07:00
committed by Android Git Automerger
parent 020d53224c 1771ee34d1
commit 07a42cfcd4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -658,7 +658,7 @@ public class GridLayout extends ViewGroup {
private void validateLayoutParams() { private void validateLayoutParams() {
final boolean horizontal = (orientation == HORIZONTAL); final boolean horizontal = (orientation == HORIZONTAL);
final Axis axis = horizontal ? horizontalAxis : verticalAxis; final Axis axis = horizontal ? horizontalAxis : verticalAxis;
final int count = max(0, axis.getCount()); // Handle negative values, including UNDEFINED final int count = (axis.definedCount != UNDEFINED) ? axis.definedCount : 0;
int major = 0; int major = 0;
int minor = 0; int minor = 0;