diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-07-21 16:23:57 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-07-21 16:24:56 -0700 |
| commit | faea1f816ead0033e52b730ab4dd598d2c186168 (patch) | |
| tree | 8bb6469390d3806772d47b76ac2ec4e6e63102fb /src/com/android/launcher2 | |
| parent | fb268317fc659a56a574045f05fbedfdd551c592 (diff) | |
| download | android_packages_apps_Trebuchet-faea1f816ead0033e52b730ab4dd598d2c186168.tar.gz android_packages_apps_Trebuchet-faea1f816ead0033e52b730ab4dd598d2c186168.tar.bz2 android_packages_apps_Trebuchet-faea1f816ead0033e52b730ab4dd598d2c186168.zip | |
Removing vestigial logic, fixing issue 4412373
Change-Id: Ifd8420caf9f3d9ae49c19964233f86d0ed497455
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index de9c1887c..65ca16270 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -715,7 +715,6 @@ public class CellLayout extends ViewGroup { cellInfo.cellY = lp.cellY; cellInfo.spanX = lp.cellHSpan; cellInfo.spanY = lp.cellVSpan; - cellInfo.valid = true; found = true; break; } @@ -731,8 +730,6 @@ public class CellLayout extends ViewGroup { 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 @@ public class CellLayout extends ViewGroup { cellInfo.cellY = -1; cellInfo.spanX = 0; cellInfo.spanY = 0; - cellInfo.valid = false; setTag(cellInfo); } @@ -1848,7 +1844,6 @@ out: for (int i = x; i < x + spanX - 1 && x < xCount; i++) { int spanY; int screen; long container; - boolean valid; @Override public String toString() { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 3050be481..996d32178 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1950,7 +1950,7 @@ public final class Launcher extends Activity 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; } |