diff options
author | Winson Chung <winsonc@google.com> | 2011-08-09 16:02:43 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-08-09 17:03:37 -0700 |
commit | c100e8eae7d67ad5bd78767494b62b8fae5d1779 (patch) | |
tree | acbd16ac61e8fa5d4256b01054d323a54a318948 /src/com/android/launcher2/PagedViewCellLayout.java | |
parent | fa2b241424f3478200e77d61db83448c2f211fee (diff) | |
download | android_packages_apps_Trebuchet-c100e8eae7d67ad5bd78767494b62b8fae5d1779.tar.gz android_packages_apps_Trebuchet-c100e8eae7d67ad5bd78767494b62b8fae5d1779.tar.bz2 android_packages_apps_Trebuchet-c100e8eae7d67ad5bd78767494b62b8fae5d1779.zip |
Tablet/AllApps fixes.
- Fixing regression where the power button did not dismiss Apps/Customize
- Fixing regression in number of icons in portrain in AC, and removing legacy peek var for calculations (5122724)
- Fixing spacing in shop button on tablet
- Fixing bug where the apps pane was being changed as we were animating (5139543)
Change-Id: I3a3e5f224fd92e99072c830d13423d195179e7c7
Diffstat (limited to 'src/com/android/launcher2/PagedViewCellLayout.java')
-rw-r--r-- | src/com/android/launcher2/PagedViewCellLayout.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index bec00ec0c..63cf9e8bf 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -46,7 +46,6 @@ public class PagedViewCellLayout extends ViewGroup implements Page { private int mWidthGap; private int mHeightGap; private int mMaxGap; - private float mPeekWidth; protected PagedViewCellLayoutChildren mChildren; private PagedViewCellLayoutChildren mHolographicChildren; private boolean mAllowHardwareLayerCreation = false; @@ -71,7 +70,6 @@ public class PagedViewCellLayout extends ViewGroup implements Page { resources.getDimensionPixelSize(R.dimen.apps_customize_cell_width); mOriginalCellHeight = mCellHeight = resources.getDimensionPixelSize(R.dimen.apps_customize_cell_height); - mPeekWidth = resources.getDimensionPixelSize(R.dimen.apps_customize_peek_width); mCellCountX = LauncherModel.getCellCountX(); mCellCountY = LauncherModel.getCellCountY(); mOriginalHeightGap = mOriginalHeightGap = mWidthGap = mHeightGap = -1; @@ -366,7 +364,7 @@ public class PagedViewCellLayout extends ViewGroup implements Page { // 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) - (2 * mPeekWidth)); + int availWidth = (int) (width - (2 * mPaddingLeft + 2 * 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)); |