commit 019145fae40207bdee73f5bd3f7e9f326dbe90d6
author Joe Onorato <joeo@android.com> Wed Nov 04 13:46:54 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 04 13:46:54 2009 -0800
tree 7ca791bd54fce81f80b5c5e4c40cc038a5342d21
parent 1ef4a799e0412b1078a74e5d01544beb0f99991b
parent 6e51630b0fbacf4beb339cfeefa762cb66f03ba8

am 6e51630b: am 6cc74de5: am eebd9249: Fix bug 2236111 - right edge of widget chopped-off while dragging

Merge commit '6e51630b0fbacf4beb339cfeefa762cb66f03ba8'

* commit '6e51630b0fbacf4beb339cfeefa762cb66f03ba8':
  Fix bug 2236111 - right edge of widget chopped-off while dragging

src/com/android/launcher2/DragView.java

diff --git a/src/com/android/launcher2/DragView.java b/src/com/android/launcher2/DragView.java
index 7128ded..7a86273 100644
--- a/src/com/android/launcher2/DragView.java
+++ b/src/com/android/launcher2/DragView.java
@@ -84,9 +84,7 @@
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int widthSize = resolveSize(mBitmap.getWidth(), widthMeasureSpec);
-        int heightSize = resolveSize(mBitmap.getHeight(), heightMeasureSpec);
-        setMeasuredDimension(widthSize, heightSize);
+        setMeasuredDimension(mBitmap.getWidth(), mBitmap.getHeight());
     }
 
     @Override