diff options
author | Michael Jurka <mikejurka@google.com> | 2011-04-05 16:52:32 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-05-13 14:38:19 -0700 |
commit | d82b5817d49f0abb841a4a2c9562b6c9f9f8ebe8 (patch) | |
tree | 19a5ede9a12985d675c314c76d2150905029e260 /src | |
parent | 12ac0d60cce75fc002da43ef20290613f069a85f (diff) | |
download | android_packages_apps_Trebuchet-d82b5817d49f0abb841a4a2c9562b6c9f9f8ebe8.tar.gz android_packages_apps_Trebuchet-d82b5817d49f0abb841a4a2c9562b6c9f9f8ebe8.tar.bz2 android_packages_apps_Trebuchet-d82b5817d49f0abb841a4a2c9562b6c9f9f8ebe8.zip |
Setting min width of content in customize tray automatically
Change-Id: Idb307dcf21422472ef098702c1bc12e99f138228
Diffstat (limited to 'src')
-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 36a638bc5..92b73a0f7 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..762ec58a5 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 getWidthBeforeFirstLayout() - (mCellWidth - Utilities.getIconContentSize()); + } + + int getWidthBeforeFirstLayout() { + return mCellCountX * mCellWidth + (mCellCountX - 1) * mWidthGap; } @Override |