diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-06-03 18:43:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-03 18:43:21 -0700 |
| commit | 759918f8517709492773d1707f07491e0ae7e07e (patch) | |
| tree | f73187878195e0cc8fa4eed34aa9ba40b36a0f93 /src | |
| parent | 88b62cfb3b1ef944cdfb40d7905baf42614b04e0 (diff) | |
| parent | 8e41ad2316c66bd3b367aef5b0aee24c4904141f (diff) | |
| download | android_packages_apps_Trebuchet-759918f8517709492773d1707f07491e0ae7e07e.tar.gz android_packages_apps_Trebuchet-759918f8517709492773d1707f07491e0ae7e07e.tar.bz2 android_packages_apps_Trebuchet-759918f8517709492773d1707f07491e0ae7e07e.zip | |
Merge "fix the build"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/AllAppsPagedView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java index 62c441f5e..0f364f865 100644 --- a/src/com/android/launcher2/AllAppsPagedView.java +++ b/src/com/android/launcher2/AllAppsPagedView.java @@ -173,7 +173,7 @@ public class AllAppsPagedView extends PagedViewWithDraggableItems implements All availableHeight -= mPageLayoutPaddingTop + mPageLayoutPaddingBottom; availableHeight -= cellHeight; // Assume at least one row Resources r = getContext().getResources(); - float scaleFactor = r.getInteger(R.integer.config_allAppsZoomScaleFactor) / 100f; + float scaleFactor = r.getInteger(R.integer.config_appsCustomizeZoomScaleFactor) / 100f; availableHeight -= screenHeight * scaleFactor; if (availableHeight > 0) { return Math.min(mMaxCellCountY, |