diff options
author | Adam Cohen <adamcohen@google.com> | 2011-08-12 18:30:51 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-08-12 18:31:46 -0700 |
commit | 0057bbcfa4a2ee12c5e87cba8c3fac8eadb078ed (patch) | |
tree | cb1f871cbceeb7e42c791e7ecc64d3453fcfa878 /src/com/android/launcher2/Folder.java | |
parent | 01f6d474e1da3864570bb7f655019d6fa0c451e3 (diff) | |
download | android_packages_apps_Trebuchet-0057bbcfa4a2ee12c5e87cba8c3fac8eadb078ed.tar.gz android_packages_apps_Trebuchet-0057bbcfa4a2ee12c5e87cba8c3fac8eadb078ed.tar.bz2 android_packages_apps_Trebuchet-0057bbcfa4a2ee12c5e87cba8c3fac8eadb078ed.zip |
Minor code cleanup, addresses issues raised in issue 5097504
Change-Id: Ib409e96986b43d0c919256b6a2584ef515c93dae
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index c490d5e6d..1fcfebc5a 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -297,13 +297,19 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList ArrayList<ShortcutInfo> children = info.contents; ArrayList<ShortcutInfo> overflow = new ArrayList<ShortcutInfo>(); setupContentForNumItems(children.size()); + int count = 0; for (int i = 0; i < children.size(); i++) { ShortcutInfo child = (ShortcutInfo) children.get(i); if (!createAndAddShortcut(child)) { overflow.add(child); + } else { + count++; } } + // We rearrange the items in case there are any empty gaps + setupContentForNumItems(count); + // If our folder has too many items we prune them from the list. This is an issue // when upgrading from the old Folders implementation which could contain an unlimited // number of items. @@ -507,8 +513,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList // by another item. If it is, we need to find the next available slot and assign // it that position. This is an issue when upgrading from the old Folders implementation // which could contain an unlimited number of items. - if (mContent.getChildAt(item.cellX, item.cellY) != null || - item.cellX < 0 || item.cellY < 0) { + if (mContent.getChildAt(item.cellX, item.cellY) != null || item.cellX < 0 || item.cellY < 0 + || item.cellX >= mContent.getCountX() || item.cellY >= mContent.getCountY()) { if (!findAndSetEmptyCells(item)) { return false; } |