diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-11 11:38:19 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-11 11:38:46 -0700 |
| commit | fee35bbfac29a55382880f846fff86003e615ccb (patch) | |
| tree | ae71ad05b99d1e697d531b66fd4c0a3ea9863ef1 /src/com/android/launcher3/FolderPagedView.java | |
| parent | 99d96ba6c8e3258f7d99a33d49da2aeb0da5d862 (diff) | |
| download | android_packages_apps_Trebuchet-fee35bbfac29a55382880f846fff86003e615ccb.tar.gz android_packages_apps_Trebuchet-fee35bbfac29a55382880f846fff86003e615ccb.tar.bz2 android_packages_apps_Trebuchet-fee35bbfac29a55382880f846fff86003e615ccb.zip | |
Updating folder grid sizes for various devices
Change-Id: Ifd5930a4d6f54428500c0ef61ef21c0fc6a6f5cd
Diffstat (limited to 'src/com/android/launcher3/FolderPagedView.java')
| -rw-r--r-- | src/com/android/launcher3/FolderPagedView.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index a1c909a1f..9f2f22581 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -51,9 +51,6 @@ public class FolderPagedView extends PagedView { private static final int[] sTempPosArray = new int[2]; - // TODO: Remove this restriction - private static final int MAX_ITEMS_PER_PAGE = 4; - public final boolean rtlLayout; private final LayoutInflater mInflater; @@ -80,13 +77,8 @@ public class FolderPagedView extends PagedView { LauncherAppState app = LauncherAppState.getInstance(); DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); - if (ALLOW_FOLDER_SCROLL) { - mMaxCountX = Math.min((int) grid.numColumns, MAX_ITEMS_PER_PAGE); - mMaxCountY = Math.min((int) grid.numRows, MAX_ITEMS_PER_PAGE); - } else { - mMaxCountX = (int) grid.numColumns; - mMaxCountY = (int) grid.numRows; - } + mMaxCountX = (int) grid.numFolderColumns; + mMaxCountY = (int) grid.numFolderRows; mMaxItemsPerPage = mMaxCountX * mMaxCountY; |