commit ec114055837998906efdf741f91ab168f6c0a6f4
author Adam Cohen <adamcohen@google.com> Thu Mar 29 15:05:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 29 15:05:59 2012 -0700
tree 31ef5579560345299d5a99edefa6b79fe6fe4ef0
parent df2b4e0745ad910bd3e00e69d220095619eb71a2
parent 5b53f29f809a0dad4a1e0717ba610ce737ee0f43

Merge "Fixing launcher ANR (issue 6238175)"

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 5aa39c4..199c41a 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -191,6 +191,8 @@
         mCountY = LauncherModel.getCellCountY();
         mOccupied = new boolean[mCountX][mCountY];
         mTmpOccupied = new boolean[mCountX][mCountY];
+        mPreviousReorderDirection[0] = INVALID_DIRECTION;
+        mPreviousReorderDirection[1] = INVALID_DIRECTION;
 
         a.recycle();
 
@@ -1566,7 +1568,8 @@
         float bestDistance = Float.MAX_VALUE;
 
         // We use this to march in a single direction
-        if (direction[0] != 0 && direction[1] != 0) { 
+        if ((direction[0] != 0 && direction[1] != 0) ||
+                (direction[0] == 0 && direction[1] == 0)) {
             return bestXY;
         }