PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Adding padding to the folder content" into ub-launcher3-burnaby

Browse Source
This commit is contained in:
Sunny Goyal
2015-05-15 02:21:59 +00:00
committed by Android (Google) Code Review
parent b2751ba524 22fc63ee29
commit a8a4546805
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/FolderPagedView.java
+7 -5
View File
@@ -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() {