Merge "Merge "Properly measure dataset presentations" into oc-dev am: 85548127a3" into oc-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-05-08 21:21:22 +00:00
committed by Android (Google) Code Review

View File

@@ -265,8 +265,11 @@ final class FillUi {
mContentWidth = 0;
mContentHeight = 0;
final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, 0);
final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, 0);
final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxSize.x,
MeasureSpec.AT_MOST);
final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxSize.y,
MeasureSpec.AT_MOST);
final int itemCount = Math.min(mAdapter.getCount(), VISIBLE_OPTIONS_MAX_COUNT);
for (int i = 0; i < itemCount; i++) {
View view = mAdapter.getItem(i).getView();