am 87467d3a: Fix 2246713 - Bad offset when picking up a widget for the first time.

Merge commit '87467d3a2168180e8d6437d07d22b4dd0ef59845' into eclair-mr2

* commit '87467d3a2168180e8d6437d07d22b4dd0ef59845':
  Fix 2246713 - Bad offset when picking up a widget for the first time.
This commit is contained in:
Joe Onorato
2009-11-09 16:15:54 -08:00
committed by Android Git Automerger
@@ -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;