Fixing issue where AllApps labels were getting clipped (Bug: 5490118)
- Tweaking the AllApps grid spacing
Change-Id: I7eb79edfd170500c1fecd6841e6f022bd40ac250
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java
index 2ef7e29..6266ca2 100644
--- a/src/com/android/launcher2/PagedViewCellLayout.java
+++ b/src/com/android/launcher2/PagedViewCellLayout.java
@@ -69,7 +69,7 @@
resources.getDimensionPixelSize(R.dimen.apps_customize_cell_height);
mCellCountX = LauncherModel.getCellCountX();
mCellCountY = LauncherModel.getCellCountY();
- mOriginalHeightGap = mOriginalHeightGap = mWidthGap = mHeightGap = -1;
+ mOriginalWidthGap = mOriginalHeightGap = mWidthGap = mHeightGap = -1;
mMaxGap = resources.getDimensionPixelSize(R.dimen.apps_customize_max_gap);
mChildren = new PagedViewCellLayoutChildren(context);
@@ -294,8 +294,8 @@
}
public void setGap(int widthGap, int heightGap) {
- mWidthGap = widthGap;
- mHeightGap = heightGap;
+ mOriginalWidthGap = mWidthGap = widthGap;
+ mOriginalHeightGap = mHeightGap = heightGap;
mChildren.setGap(widthGap, heightGap);
}
@@ -325,10 +325,9 @@
* Estimates the number of cells that the specified width would take up.
*/
public int estimateCellHSpan(int width) {
- // The space for a page assuming that we want to show half of a column of the previous and
- // next pages is the width - left padding (current & next page) - right padding (previous &
- // current page) - half cell width (for previous and next pages)
- int availWidth = (int) (width - (2 * mPaddingLeft + 2 * mPaddingRight));
+ // We don't show the next/previous pages any more, so we use the full width, minus the
+ // padding
+ int availWidth = width - (mPaddingLeft + mPaddingRight);
// We know that we have to fit N cells with N-1 width gaps, so we just juggle to solve for N
int n = Math.max(1, (availWidth + mWidthGap) / (mCellWidth + mWidthGap));