commit a0abe2661eaf4f8e66990ac68386e54260836183
author Winson Chung <winsonc@google.com> Thu May 14 19:35:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 14 19:35:58 2015 +0000
tree 70adfea8c9555ad19d23c730d425914df21a5ffa
parent 88c66dd4c584455fd9e7208f28ac7bed5b005461
parent 532e6ea2e6e4b5f968038b52db9bb998cb9fe84a

Merge "Fixing crash when updating the scroll position state when there are no items." into ub-launcher3-burnaby

src/com/android/launcher3/AppsContainerRecyclerView.java

diff --git a/src/com/android/launcher3/AppsContainerRecyclerView.java b/src/com/android/launcher3/AppsContainerRecyclerView.java
index 34e621a..3859be8 100644
--- a/src/com/android/launcher3/AppsContainerRecyclerView.java
+++ b/src/com/android/launcher3/AppsContainerRecyclerView.java
@@ -497,6 +497,12 @@
         stateOut.rowIndex = -1;
         stateOut.rowTopOffset = -1;
         stateOut.rowHeight = -1;
+
+        // Return early if there are no items
+        if (items.isEmpty()) {
+            return;
+        }
+
         int childCount = getChildCount();
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);