diff options
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 9a0b79c2f..e0978b5de 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -110,6 +110,7 @@ public abstract class PagedView extends ViewGroup { protected int mPageLayoutPaddingRight; protected int mPageLayoutWidthGap; protected int mPageLayoutHeightGap; + protected int mPageLayoutMaxHeight; protected int mCellCountX; protected int mCellCountY; protected boolean mCenterPagesVertically; @@ -189,6 +190,8 @@ public abstract class PagedView extends ViewGroup { R.styleable.PagedView_pageLayoutWidthGap, -1); mPageLayoutHeightGap = a.getDimensionPixelSize( R.styleable.PagedView_pageLayoutHeightGap, -1); + mPageLayoutMaxHeight = a.getDimensionPixelSize( + R.styleable.PagedView_pageLayoutMaxHeight, -1); a.recycle(); setHapticFeedbackEnabled(false); @@ -388,6 +391,10 @@ public abstract class PagedView extends ViewGroup { final int verticalPadding = mPaddingTop + mPaddingBottom; + if (mPageLayoutMaxHeight != -1) { + heightSize = Math.min(mPageLayoutMaxHeight, heightSize); + } + // The children are given the same width and height as the workspace // unless they were set to WRAP_CONTENT final int childCount = getChildCount(); |