Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2

This commit is contained in:
Michael Jurka
2011-06-03 14:15:44 -07:00
committed by Android (Google) Code Review

View File

@@ -174,7 +174,9 @@ public class AllAppsPagedView extends PagedViewWithDraggableItems implements All
availableHeight -= mPageLayoutPaddingTop + mPageLayoutPaddingBottom;
availableHeight -= cellHeight; // Assume at least one row
availableHeight -= screenHeight * 0.16f;
Resources r = getContext().getResources();
float scaleFactor = r.getInteger(R.integer.config_allAppsZoomScaleFactor) / 100f;
availableHeight -= screenHeight * scaleFactor;
if (availableHeight > 0) {
return Math.min(mMaxCellCountY,
1 + availableHeight / (cellHeight + mPageLayoutHeightGap));