From 87467d3a2168180e8d6437d07d22b4dd0ef59845 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Sun, 8 Nov 2009 14:36:43 -0500
Subject: [PATCH] Fix 2246713 - Bad offset when picking up a widget for the
 first time.

---
 src/com/android/launcher2/DragController.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index d4d142458f..5eb9007181 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -305,6 +305,10 @@ public class DragController {
         }
         final int action = ev.getAction();
 
+        if (action == MotionEvent.ACTION_DOWN) {
+            recordScreenSize();
+        }
+
         final int screenX = clamp((int)ev.getRawX(), 0, mDisplayMetrics.widthPixels);
         final int screenY = clamp((int)ev.getRawY(), 0, mDisplayMetrics.heightPixels);
 
@@ -316,7 +320,6 @@ public class DragController {
                 // Remember location of down touch
                 mMotionDownX = screenX;
                 mMotionDownY = screenY;
-                recordScreenSize();
                 mLastDropTarget = null;
                 break;
 
@@ -351,7 +354,6 @@ public class DragController {
             // Remember where the motion event started
             mMotionDownX = screenX;
             mMotionDownY = screenY;
-            recordScreenSize();
 
             if ((screenX < SCROLL_ZONE) || (screenX > scrollView.getWidth() - SCROLL_ZONE)) {
                 mScrollState = SCROLL_WAITING_IN_ZONE;