summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2015-04-28 01:33:06 (GMT)
committerRaj Yengisetty <rajesh@cyngn.com>2015-05-13 03:09:49 (GMT)
commit22e21ad7a891988adad36453cc30a460da4cadb8 (patch)
treeb719208eaed1314a6ff1d2c9f63e6c466a037d88
parent5207eac2786b15534252b826662dbe537144c2c7 (diff)
downloadandroid_packages_apps_Trebuchet-22e21ad7a891988adad36453cc30a460da4cadb8.zip
android_packages_apps_Trebuchet-22e21ad7a891988adad36453cc30a460da4cadb8.tar.gz
android_packages_apps_Trebuchet-22e21ad7a891988adad36453cc30a460da4cadb8.tar.bz2
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
-rw-r--r--src/com/android/launcher3/Folder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 7267f32..76e3134 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;
}