diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-06-03 14:15:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-03 14:15:44 -0700 |
| commit | a9c683d97eff5fde190e2e60d25259cea53eab24 (patch) | |
| tree | 48946b200712645f4329da61c58feca28e123bff /src/com/android | |
| parent | 2478480a9724804fd363dfa99c42ddfba4c46acc (diff) | |
| parent | 25dfc08894bbdb1b8376983ec02cf04dbd71b7da (diff) | |
| download | android_packages_apps_Trebuchet-a9c683d97eff5fde190e2e60d25259cea53eab24.tar.gz android_packages_apps_Trebuchet-a9c683d97eff5fde190e2e60d25259cea53eab24.tar.bz2 android_packages_apps_Trebuchet-a9c683d97eff5fde190e2e60d25259cea53eab24.zip | |
Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2
Diffstat (limited to 'src/com/android')
| -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 fd5979fd6..36ff8e1b5 100644 --- a/src/com/android/launcher2/AllAppsPagedView.java +++ b/src/com/android/launcher2/AllAppsPagedView.java @@ -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)); |