commit 28750fba6a2d141eb9a1e566718c17236030b815
author Michael Jurka <mikejurka@google.com> Fri Sep 24 17:43:49 2010 -0700
committer Michael Jurka <mikejurka@google.com> Fri Sep 24 18:34:23 2010 -0700
tree 1e9b8edb02ed45b9d4622983bda4b2cfac57930c
parent 0280c3be4d9f8fc6fdf015b7ecd276eb26f76f2d

fixed minor code review issues from change I0280c3be
(it was submitted early accidentally)

Change-Id: I3753366b4d5e1dc228baf02eba27a2c0d8fa42cf

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 19b5852..62e32d2 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -490,7 +490,7 @@
     }
 
     @Override
-    public void onLayout(boolean changed, int l, int t, int r, int b) {
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
         int count = getChildCount();
 
         for (int i = 0; i < count; i++) {
@@ -578,18 +578,17 @@
         if (ignoreView != null) {
             markCellsAsUnoccupiedForView(ignoreView);
         }
+        boolean isVacant = true;
         for (int i = 0; i < spanY; i++) {
             if (!isRowEmpty(originY + i, originX, originX + spanX - 1, mOccupied)) {
-                if (ignoreView != null) {
-                    markCellsAsOccupiedForView(ignoreView);
-                }
-                return false;
+                isVacant = false;
+                break;
             }
         }
         if (ignoreView != null) {
             markCellsAsOccupiedForView(ignoreView);
         }
-        return true;
+        return isVacant;
     }
 
     private boolean isVacant(int originX, int originY, int spanX, int spanY) {
@@ -801,6 +800,7 @@
             markCellsAsUnoccupiedForView(ignoreView);
         }
 
+        boolean foundCell = false;
         while (true) {
             int startX = 0;
             if (intersectX >= 0) {
@@ -836,10 +836,8 @@
                         cellXY[0] = x;
                         cellXY[1] = y;
                     }
-                    if (ignoreView != null) {
-                        markCellsAsOccupiedForView(ignoreView);
-                    }
-                    return true;
+                    foundCell = true;
+                    break;
                 }
             }
             if (intersectX == -1 && intersectY == -1) {
@@ -856,7 +854,7 @@
         if (ignoreView != null) {
             markCellsAsOccupiedForView(ignoreView);
         }
-        return false;
+        return foundCell;
     }
 
     /**