diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-13 16:01:07 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-13 16:01:26 -0700 |
commit | 22fc63ee298335b5f5c603ea1b77dc0e6180b16a (patch) | |
tree | 6b66018a847b66e0940ed3c54f6f3516a63d9536 /src/com/android/launcher3/FolderPagedView.java | |
parent | 358af81ca4a6495e20b2efe086dfafe844985cd3 (diff) | |
download | android_packages_apps_Trebuchet-22fc63ee298335b5f5c603ea1b77dc0e6180b16a.tar.gz android_packages_apps_Trebuchet-22fc63ee298335b5f5c603ea1b77dc0e6180b16a.tar.bz2 android_packages_apps_Trebuchet-22fc63ee298335b5f5c603ea1b77dc0e6180b16a.zip |
Adding padding to the folder content
Change-Id: I88e56ff1aa26282e0167e2599f1b34ee374b705f
Diffstat (limited to 'src/com/android/launcher3/FolderPagedView.java')
-rw-r--r-- | src/com/android/launcher3/FolderPagedView.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index a6494d274..125de3ffa 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -237,13 +237,13 @@ public class FolderPagedView extends PagedView { page.setInvertIfRtl(true); page.setGridSize(mGridCountX, mGridCountY); - LayoutParams lp = generateDefaultLayoutParams(); - lp.isFullScreenPage = true; - addView(page, -1, lp); + addView(page, -1, generateDefaultLayoutParams()); return page; } public void setFixedSize(int width, int height) { + width -= (getPaddingLeft() + getPaddingRight()); + height -= (getPaddingTop() + getPaddingBottom()); for (int i = getChildCount() - 1; i >= 0; i --) { ((CellLayout) getChildAt(i)).setFixedSize(width, height); } @@ -339,11 +339,13 @@ public class FolderPagedView extends PagedView { } public int getDesiredWidth() { - return getPageCount() > 0 ? getPageAt(0).getDesiredWidth() : 0; + return getPageCount() > 0 ? + (getPageAt(0).getDesiredWidth() + getPaddingLeft() + getPaddingRight()) : 0; } public int getDesiredHeight() { - return getPageCount() > 0 ? getPageAt(0).getDesiredHeight() : 0; + return getPageCount() > 0 ? + (getPageAt(0).getDesiredHeight() + getPaddingTop() + getPaddingBottom()) : 0; } public int getItemCount() { |