commit 5b53f29f809a0dad4a1e0717ba610ce737ee0f43
author Adam Cohen <adamcohen@google.com> Thu Mar 29 14:30:35 2012 -0700
committer Winson Chung <winsonc@google.com> Thu Mar 29 15:02:54 2012 -0700
tree 29518abba7ec4b23b79c43f5e892893b5bf8de23
parent 4b57851287a8806cad6f836e24c5b835a48c22a9

Fixing launcher ANR (issue 6238175)

Change-Id: I6518ea9e6ce8b50a5f2a3b24e909e18c5b1bde51

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index fb319fe..79d8dc5 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -189,6 +189,8 @@
         mCountY = LauncherModel.getCellCountY();
         mOccupied = new boolean[mCountX][mCountY];
         mTmpOccupied = new boolean[mCountX][mCountY];
+        mPreviousReorderDirection[0] = INVALID_DIRECTION;
+        mPreviousReorderDirection[1] = INVALID_DIRECTION;
 
         a.recycle();
 
@@ -1564,7 +1566,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;
         }