commit fb445cd97d828fa2d9fe3190b25524e39038cd0b
author Sunny Goyal <sunnygoyal@google.com> Thu May 14 21:42:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 14 21:42:07 2015 +0000
tree b58f33560f46eb71565ed32ca29293e8a5d07086
parent c2af7f9175d6ae1cb1ec599a6b9361f4434fa531
parent 7066003b2032a49ae5e59dab9b706259bdeb7e6e

Merge "Various lint error fixes." 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 d35f99d..861767e 100644
--- a/src/com/android/launcher3/AppsContainerRecyclerView.java
+++ b/src/com/android/launcher3/AppsContainerRecyclerView.java
@@ -495,6 +495,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);

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 33c3d50..ad0afd9 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -443,7 +443,7 @@
         int availableAppsWidthPx = (containerWidth > 0) ? containerWidth : availableWidthPx;
         int numAppsCols = (availableAppsWidthPx - appsViewLeftMarginPx) /
                 (allAppsCellWidthPx + 2 * allAppsCellPaddingPx);
-        int numPredictiveAppCols = Math.max(numColumns, numAppsCols);
+        int numPredictiveAppCols = isPhone() ? 4 : numAppsCols;
         if ((numAppsCols != appsViewNumCols) ||
                 (numPredictiveAppCols != appsViewNumPredictiveCols)) {
             appsViewNumCols = numAppsCols;