commit bf6cb220078a0fb16256285c25bc58552ed445da
author Michael Jurka <mikejurka@google.com> Fri Jun 03 17:56:01 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 03 17:56:01 2011 -0700
tree e6b222dc003571a0eceecd741276792c5674590c
parent 50f3ad14436c21ea0670d15c6f4468fe616c66f7
parent 1e21c180caeab819eeb55da7093fc12a90e5f67a

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

* commit '1e21c180caeab819eeb55da7093fc12a90e5f67a':
  Fixing calculation of # of rows in All Apps

src/com/android/launcher2/AllAppsPagedView.java

diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java
index f195470..62c441f 100644
--- a/src/com/android/launcher2/AllAppsPagedView.java
+++ b/src/com/android/launcher2/AllAppsPagedView.java
@@ -172,7 +172,9 @@
 
         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));