diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-07-17 21:03:04 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-07-17 22:00:50 -0700 |
| commit | 234c4cd54406e363a2ebc213f6ae5be284414988 (patch) | |
| tree | a46c8e54b79e9036127127a2859d194b69d4000c /src/com/android/launcher2/PagedViewCellLayout.java | |
| parent | 95383fe41dacc45c2aa97e7f47bafebb5b7655d8 (diff) | |
| download | android_packages_apps_Trebuchet-234c4cd54406e363a2ebc213f6ae5be284414988.tar.gz android_packages_apps_Trebuchet-234c4cd54406e363a2ebc213f6ae5be284414988.tar.bz2 android_packages_apps_Trebuchet-234c4cd54406e363a2ebc213f6ae5be284414988.zip | |
Fix text clipping in Launcher (bug 4980315)
Change-Id: I20c9b98b606d317ed32d49a3437f24a4cd312759
Diffstat (limited to 'src/com/android/launcher2/PagedViewCellLayout.java')
| -rw-r--r-- | src/com/android/launcher2/PagedViewCellLayout.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index fc1b01288..bec00ec0c 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -41,6 +41,8 @@ public class PagedViewCellLayout extends ViewGroup implements Page { private int mOriginalCellHeight; private int mCellWidth; private int mCellHeight; + private int mOriginalWidthGap; + private int mOriginalHeightGap; private int mWidthGap; private int mHeightGap; private int mMaxGap; @@ -72,7 +74,7 @@ public class PagedViewCellLayout extends ViewGroup implements Page { mPeekWidth = resources.getDimensionPixelSize(R.dimen.apps_customize_peek_width); mCellCountX = LauncherModel.getCellCountX(); mCellCountY = LauncherModel.getCellCountY(); - mWidthGap = mHeightGap = -1; + mOriginalHeightGap = mOriginalHeightGap = mWidthGap = mHeightGap = -1; mMaxGap = resources.getDimensionPixelSize(R.dimen.apps_customize_max_gap); mChildren = new PagedViewCellLayoutChildren(context); @@ -221,12 +223,10 @@ public class PagedViewCellLayout extends ViewGroup implements Page { throw new RuntimeException("CellLayout cannot have UNSPECIFIED dimensions"); } - - int numWidthGaps = mCellCountX - 1; int numHeightGaps = mCellCountY - 1; - if (mWidthGap < 0 || mHeightGap < 0) { + if (mOriginalWidthGap < 0 || mOriginalHeightGap < 0) { int hSpace = widthSpecSize - mPaddingLeft - mPaddingRight; int vSpace = heightSpecSize - mPaddingTop - mPaddingBottom; int hFreeSpace = hSpace - (mCellCountX * mOriginalCellWidth); @@ -236,6 +236,9 @@ public class PagedViewCellLayout extends ViewGroup implements Page { mChildren.setGap(mWidthGap, mHeightGap); mHolographicChildren.setGap(mWidthGap, mHeightGap); + } else { + mWidthGap = mOriginalWidthGap; + mHeightGap = mOriginalHeightGap; } // Initial values correspond to widthSpecMode == MeasureSpec.EXACTLY |