commit b419591a8eaf263e35507f889d119548a71e21dc
author Sunny Goyal <sunnygoyal@google.com> Fri Mar 06 19:58:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 06 19:58:35 2015 +0000
tree b9ea0863b1d3546fb3ef07a6ab0d64d61d19d3a8
parent 9b8fd187130730c64d208e12a024ee9c7e50ff00
parent 1c0e633bd59e0f14f799cbb6aee33266032998fa

am 1c0e633b: Handling getLastItem when the folder is closed

* commit '1c0e633bd59e0f14f799cbb6aee33266032998fa':
  Handling getLastItem when the folder is closed

src/com/android/launcher3/FolderCellLayout.java

diff --git a/src/com/android/launcher3/FolderCellLayout.java b/src/com/android/launcher3/FolderCellLayout.java
index e6e9199..b354ec7 100644
--- a/src/com/android/launcher3/FolderCellLayout.java
+++ b/src/com/android/launcher3/FolderCellLayout.java
@@ -245,7 +245,13 @@
     @Override
     public View getLastItem() {
         int lastRank = getShortcutsAndWidgets().getChildCount() - 1;
-        return getShortcutsAndWidgets().getChildAt(lastRank % getCountX(), lastRank / getCountX());
+        // count can be zero if the folder is not yet laid out.
+        int count = getCountX();
+        if (count > 0) {
+            return getShortcutsAndWidgets().getChildAt(lastRank % count, lastRank / count);
+        } else {
+            return getShortcutsAndWidgets().getChildAt(lastRank);
+        }
     }
 
     @Override