commit 4b576be59e58072cc03b5a8d36afb6a322513575
author Winson Chung <winsonc@google.com> Wed Apr 27 17:40:20 2011 -0700
committer Winson Chung <winsonc@google.com> Thu Apr 28 14:53:51 2011 -0700
tree 4bb56e5ca8dfc2438bf71739a32a24d7687021bf
parent 9e87bd8ee7bcd900bce27784a42fecd878016090

Adding back the widgets pane to the merged AllApps.

- Fixing issue with holographic drag outlines being drawn offset

Change-Id: Ie0e89d76ce6714b44f9cd2ddf99ad608b51bf005

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index d7a59d6..b41972a 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -995,8 +995,10 @@
                 top += (v.getHeight() - dragOutline.getHeight()) / 2;
             } else {
                 // Center the drag outline in the cell
-                left += (mCellWidth - dragOutline.getWidth()) / 2;
-                top += (mCellHeight - dragOutline.getHeight()) / 2;
+                left += ((mCellWidth * spanX) + ((spanX - 1) * mWidthGap)
+                        - dragOutline.getWidth()) / 2;
+                top += ((mCellHeight * spanY) + ((spanY - 1) * mHeightGap)
+                        - dragOutline.getHeight()) / 2;
             }
 
             final int oldIndex = mDragOutlineCurrent;