android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
</FrameLayout>
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);
}
}
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() {
pageGap = getPaddingRight();
}
- childLeft += childWidth + pageGap;
+ childLeft += childWidth + pageGap
+ + (lp.isFullScreenPage ? 0 : (getPaddingLeft() + getPaddingRight()));
}
}