From 22e21ad7a891988adad36453cc30a460da4cadb8 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Mon, 27 Apr 2015 18:33:06 -0700 Subject: Trebuchet: limit folder size to numRowsBase and numColumnsBase Otherwise the size of the folder is determined by the size of the Dynamic Grid. This causes some weird issues with sizes and scrolling so just cap this to the base values for the numRows and numColumns. Change-Id: I5b1f13267299d3ab1f28e6e393d6260fa7fbdd3e --- src/com/android/launcher3/Folder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 7267f327c..76e313470 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -166,12 +166,12 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mIconCache = app.getIconCache(); Resources res = getResources(); - mMaxCountX = (int) grid.numColumns; + mMaxCountX = (int) grid.numColumnsBase; // Allow scrolling folders when DISABLE_ALL_APPS is true. if (LauncherAppState.isDisableAllApps()) { mMaxCountY = mMaxNumItems = Integer.MAX_VALUE; } else { - mMaxCountY = (int) grid.numRows; + mMaxCountY = (int) grid.numRowsBase; mMaxNumItems = mMaxCountX * mMaxCountY; } -- cgit v1.2.3