diff options
| author | Winson Chung <winsonc@google.com> | 2011-04-27 17:40:20 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-04-28 14:53:51 -0700 |
| commit | 4b576be59e58072cc03b5a8d36afb6a322513575 (patch) | |
| tree | 4bb56e5ca8dfc2438bf71739a32a24d7687021bf /src/com/android/launcher2/PagedViewCellLayout.java | |
| parent | 9e87bd8ee7bcd900bce27784a42fecd878016090 (diff) | |
| download | android_packages_apps_Trebuchet-4b576be59e58072cc03b5a8d36afb6a322513575.tar.gz android_packages_apps_Trebuchet-4b576be59e58072cc03b5a8d36afb6a322513575.tar.bz2 android_packages_apps_Trebuchet-4b576be59e58072cc03b5a8d36afb6a322513575.zip | |
Adding back the widgets pane to the merged AllApps.
- Fixing issue with holographic drag outlines being drawn offset
Change-Id: Ie0e89d76ce6714b44f9cd2ddf99ad608b51bf005
Diffstat (limited to 'src/com/android/launcher2/PagedViewCellLayout.java')
| -rw-r--r-- | src/com/android/launcher2/PagedViewCellLayout.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index 196063d29..40be03d49 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -267,8 +267,12 @@ public class PagedViewCellLayout extends ViewGroup implements Page { } } + int getContentHeight() { + return mCellCountY * mCellHeight + (mCellCountY - 1) * Math.max(0, mHeightGap); + } + int getWidthBeforeFirstLayout() { - return mCellCountX * mCellWidth + (mCellCountX - 1) * mWidthGap; + return mCellCountX * mCellWidth + (mCellCountX - 1) * Math.max(0, mWidthGap); } @Override |