diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/AllAppsPagedView.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 11 | ||||
| -rw-r--r-- | src/com/android/launcher2/CustomizeTrayTabHost.java | 2 |
3 files changed, 6 insertions, 11 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)); diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index f189cd58e..154b2a05f 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -271,13 +271,10 @@ public class CellLayout extends ViewGroup { // We use this method from Workspace to figure out how many rows/columns Launcher should // have. We ignore the left/right padding on CellLayout because it turns out in our design // the padding extends outside the visible screen size, but it looked fine anyway. - // However, we make sure there's at least enough space for the crosshairs at either - // edge to be rendered (half the crosshair is sticking out on either side) int cellWidth = r.getDimensionPixelSize(R.dimen.workspace_cell_width); int widthGap = r.getDimensionPixelSize(R.dimen.workspace_width_gap_port); - int crosshairsSize = r.getDrawable(R.drawable.gardening_crosshairs).getIntrinsicWidth(); - return widthGap * (numCells - 1) + cellWidth * numCells + crosshairsSize; + return widthGap * (numCells - 1) + cellWidth * numCells; } static int widthInLandscape(Resources r, int numCells) { @@ -311,14 +308,10 @@ public class CellLayout extends ViewGroup { // We use this method from Workspace to figure out how many rows/columns Launcher should // have. We ignore the left/right padding on CellLayout because it turns out in our design // the padding extends outside the visible screen size, but it looked fine anyway. - // However, we make sure there's at least enough space for the crosshairs at the bottom - // to be rendered (half the crosshair is sticking out); we don't worry about the top - // crosshair since it can bleed into the action bar space int cellHeight = r.getDimensionPixelSize(R.dimen.workspace_cell_height); int heightGap = r.getDimensionPixelSize(R.dimen.workspace_height_gap_land); - int crosshairsSize = r.getDrawable(R.drawable.gardening_crosshairs).getIntrinsicHeight(); - return heightGap * (numCells - 1) + cellHeight * numCells + (crosshairsSize + 1) / 2; + return heightGap * (numCells - 1) + cellHeight * numCells; } public void enableHardwareLayers() { diff --git a/src/com/android/launcher2/CustomizeTrayTabHost.java b/src/com/android/launcher2/CustomizeTrayTabHost.java index c6a39b377..578081859 100644 --- a/src/com/android/launcher2/CustomizeTrayTabHost.java +++ b/src/com/android/launcher2/CustomizeTrayTabHost.java @@ -84,7 +84,7 @@ public class CustomizeTrayTabHost extends TabHost implements LauncherTransitiona .setIndicator(tabView).setContent(contentFactory)); tabView = (TextView) mInflater.inflate( R.layout.customize_tab_widget_indicator, tabWidget, false); - tabView.setText(mContext.getString(R.string.applications_tab_label)); + tabView.setText(mContext.getString(R.string.all_apps_tab_apps)); addTab(newTabSpec(APPLICATIONS_TAG) .setIndicator(tabView).setContent(contentFactory)); tabView = (TextView) mInflater.inflate( |