commit 0cffae54f9b501144735cfc046c90da824840c08
author Michael Jurka <mikejurka@google.com> Thu Aug 22 22:12:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 22 22:12:25 2013 +0000
tree 6946e10ed902b08be0772bbac6cd375acd24eb24
parent 61c69869b3947f1d242b07384bb4e9cd5b266915
parent fbf25c19aa50f4bc2d3479b7ffb08609f2974e9e

Merge "Disable zoom/pan for built-in wallpapers" into jb-ub-gel-agar

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e8103f5..d80c2ac 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -784,8 +784,8 @@
                 ItemInfo item = new ItemInfo();
                 item.cellX = c.getInt(cellXIndex);
                 item.cellY = c.getInt(cellYIndex);
-                item.spanX = c.getInt(spanXIndex);
-                item.spanY = c.getInt(spanYIndex);
+                item.spanX = Math.max(1, c.getInt(spanXIndex));
+                item.spanY = Math.max(1, c.getInt(spanYIndex));
                 item.container = c.getInt(containerIndex);
                 item.itemType = c.getInt(itemTypeIndex);
                 item.screenId = c.getInt(screenIndex);