diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-05-18 17:24:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-18 17:24:13 -0700 |
| commit | 0be3641eab1236958e610f732d31da36cbf16432 (patch) | |
| tree | f60f3ef1bca8748e764105ce71db1d911c95e1c1 /src | |
| parent | b5f09f271b44aab1034a654e44f2aa79a4655058 (diff) | |
| parent | 4dbe6d993485a702505ee4895db94aaa89655f2c (diff) | |
| download | android_packages_apps_Trebuchet-0be3641eab1236958e610f732d31da36cbf16432.tar.gz android_packages_apps_Trebuchet-0be3641eab1236958e610f732d31da36cbf16432.tar.bz2 android_packages_apps_Trebuchet-0be3641eab1236958e610f732d31da36cbf16432.zip | |
Merge "Fix index out of bounds"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 3411f2723..0470e41f5 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -219,6 +219,7 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL ShortcutInfo child = (ShortcutInfo) children.get(i); createAndAddShortcut(child); } + mItemsInvalidated = true; mInfo.addListener(this); } diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 939dc44de..2a5a5a0cf 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -270,7 +270,7 @@ public class FolderIcon extends FrameLayout implements DropTarget, FolderListene ArrayList<View> items = mFolder.getItemsInReadingOrder(); int firstItemIndex = Math.max(0, items.size() - NUM_ITEMS_IN_PREVIEW); - for (int i = firstItemIndex; i < mFolder.getItemCount(); i++) { + for (int i = firstItemIndex; i < items.size(); i++) { v = (TextView) items.get(i); d = v.getCompoundDrawables()[1]; |