commit faea1f816ead0033e52b730ab4dd598d2c186168
author Adam Cohen <adamcohen@google.com> Thu Jul 21 16:23:57 2011 -0700
committer Adam Cohen <adamcohen@google.com> Thu Jul 21 16:24:56 2011 -0700
tree 8bb6469390d3806772d47b76ac2ec4e6e63102fb
parent fb268317fc659a56a574045f05fbedfdd551c592

Removing vestigial logic, fixing issue 4412373

Change-Id: Ifd8420caf9f3d9ae49c19964233f86d0ed497455

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index de9c188..65ca162 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -715,7 +715,6 @@
                     cellInfo.cellY = lp.cellY;
                     cellInfo.spanX = lp.cellHSpan;
                     cellInfo.spanY = lp.cellVSpan;
-                    cellInfo.valid = true;
                     found = true;
                     break;
                 }
@@ -731,8 +730,6 @@
             cellInfo.cellY = cellXY[1];
             cellInfo.spanX = 1;
             cellInfo.spanY = 1;
-            cellInfo.valid = cellXY[0] >= 0 && cellXY[1] >= 0 && cellXY[0] < mCountX &&
-                    cellXY[1] < mCountY && !mOccupied[cellXY[0]][cellXY[1]];
         }
         setTag(cellInfo);
     }
@@ -753,7 +750,6 @@
             cellInfo.cellY = -1;
             cellInfo.spanX = 0;
             cellInfo.spanY = 0;
-            cellInfo.valid = false;
             setTag(cellInfo);
         }
 
@@ -1848,7 +1844,6 @@
         int spanY;
         int screen;
         long container;
-        boolean valid;
 
         @Override
         public String toString() {

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 3050be4..996d321 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1950,7 +1950,7 @@
         resetAddInfo();
         CellLayout.CellInfo longClickCellInfo = (CellLayout.CellInfo) v.getTag();
         // This happens when long clicking an item with the dpad/trackball
-        if (longClickCellInfo == null || !longClickCellInfo.valid) {
+        if (longClickCellInfo == null) {
             return true;
         }