am 87e560bc: am a9c683d9: Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2

* commit '87e560bc798221fc857d4380be90dc6b78021fd2':
  Fixing calculation of # of rows in All Apps
This commit is contained in:
Michael Jurka
2011-06-03 14:22:51 -07:00
committed by Android Git Automerger

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));