commit ca17c6411b4687dc97bc7c023e32a0a45f921c8b
author Dake Gu <dake@google.com> Fri Oct 30 23:13:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 30 23:13:15 2015 +0000
tree 2b4e1371440a887c45c4e0cade3023621530460e
parent b518b3afec21cb8e843f00971bf6c176fe34c371
parent 9a8833a689869ecdacfcc280b5cffb133ccf9f76

Merge "GridLayoutManager: Dont crash in measure when using weight" into mnc-ub-dev

v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java b/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
index 3444cbf..e7fa99f0 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
@@ -1287,14 +1287,8 @@
         } else {
             switch (modeSecondary) {
             case MeasureSpec.UNSPECIFIED:
-                if (mRowSizeSecondaryRequested == 0) {
-                    if (mOrientation == HORIZONTAL) {
-                        throw new IllegalStateException("Must specify rowHeight or view height");
-                    } else {
-                        throw new IllegalStateException("Must specify columnWidth or view width");
-                    }
-                }
-                mFixedRowSizeSecondary = mRowSizeSecondaryRequested;
+                mFixedRowSizeSecondary = mRowSizeSecondaryRequested == 0 ?
+                        sizeSecondary - paddingSecondary: mRowSizeSecondaryRequested;
                 mNumRows = mNumRowsRequested == 0 ? 1 : mNumRowsRequested;
                 measuredSizeSecondary = mFixedRowSizeSecondary * mNumRows + mMarginSecondary
                     * (mNumRows - 1) + paddingSecondary;