diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-06-03 17:56:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-03 17:56:01 -0700 |
| commit | bf6cb220078a0fb16256285c25bc58552ed445da (patch) | |
| tree | e6b222dc003571a0eceecd741276792c5674590c /src/com | |
| parent | 50f3ad14436c21ea0670d15c6f4468fe616c66f7 (diff) | |
| parent | 1e21c180caeab819eeb55da7093fc12a90e5f67a (diff) | |
| download | android_packages_apps_Trebuchet-bf6cb220078a0fb16256285c25bc58552ed445da.tar.gz android_packages_apps_Trebuchet-bf6cb220078a0fb16256285c25bc58552ed445da.tar.bz2 android_packages_apps_Trebuchet-bf6cb220078a0fb16256285c25bc58552ed445da.zip | |
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
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/AllAppsPagedView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java index f19547086..62c441f5e 100644 --- a/src/com/android/launcher2/AllAppsPagedView.java +++ b/src/com/android/launcher2/AllAppsPagedView.java @@ -172,7 +172,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)); |