diff options
author | Michael Jurka <mikejurka@google.com> | 2011-04-05 16:52:32 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-04-05 16:52:32 -0700 |
commit | 0413dfa01b822e349092636774dc948b9230adea (patch) | |
tree | dd8c1e512457adfe2dbd203a2e248c352236bf16 /src/com/android/launcher2 | |
parent | 3f272c6665090a006859892f441b058deb3d6fab (diff) | |
download | android_packages_apps_Trebuchet-0413dfa01b822e349092636774dc948b9230adea.tar.gz android_packages_apps_Trebuchet-0413dfa01b822e349092636774dc948b9230adea.tar.bz2 android_packages_apps_Trebuchet-0413dfa01b822e349092636774dc948b9230adea.zip |
Setting min width of content in customize tray automatically
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/CustomizePagedView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedViewCellLayout.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java index 3dfa7c267..55b22fcd3 100644 --- a/src/com/android/launcher2/CustomizePagedView.java +++ b/src/com/android/launcher2/CustomizePagedView.java @@ -172,12 +172,12 @@ public class CustomizePagedView extends PagedViewWithDraggableItems final Resources r = context.getResources(); setDragSlopeThreshold( r.getInteger(R.integer.config_customizationDrawerDragSlopeThreshold) / 100.0f); - mMinPageWidth = r.getDimensionPixelSize(R.dimen.customization_drawer_content_min_width); // Create a dummy page and set it up to find out the content width (used by our parent) PagedViewCellLayout layout = new PagedViewCellLayout(getContext()); setupPage(layout); mPageContentWidth = layout.getContentWidth(); + mMinPageWidth = layout.getWidthBeforeFirstLayout(); setVisibility(View.GONE); setSoundEffectsEnabled(false); diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index 53657e5cb..b94be4d6f 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -247,9 +247,12 @@ public class PagedViewCellLayout extends ViewGroup implements Page { // Return the distance from the left edge of the content of the leftmost icon to // the right edge of the content of the rightmost icon - // icons are centered within cells, find out how much offset that accounts for - int iconHorizontalOffset = (mCellWidth - Utilities.getIconContentSize()); - return mCellCountX * mCellWidth + (mCellCountX - 1) * mWidthGap - iconHorizontalOffset; + // icons are centered within cells, find out how much padding that accounts for + return getWidthBeforeLayout() - (mCellWidth - Utilities.getIconContentSize()); + } + + int getWidthBeforeLayout() { + return mCellCountX * mCellWidth + (mCellCountX - 1) * mWidthGap; } @Override |