Merge "Selection drawing problem"

2 files changed, 4 insertions, 14 deletions

diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index b15d0e0e..170574d8 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -799,6 +799,9 @@ public class ComposeMessageActivity extends Activity
 
     private final void addCallAndContactMenuItems(
             ContextMenu menu, MsgListMenuClickListener l, MessageItem msgItem) {
+        if (TextUtils.isEmpty(msgItem.mBody)) {
+            return;
+        }
         SpannableString msg = new SpannableString(msgItem.mBody);
         Linkify.addLinks(msg, Linkify.ALL);
         ArrayList<String> uris =
diff --git a/src/com/android/mms/ui/MessageListItem.java b/src/com/android/mms/ui/MessageListItem.java
index dcfcac77..47978f72 100644
--- a/src/com/android/mms/ui/MessageListItem.java
+++ b/src/com/android/mms/ui/MessageListItem.java
@@ -710,26 +710,12 @@ public class MessageListItem extends LinearLayout implements
             Path path = mPath;
             path.reset();
 
-            // This block of code draws our own background but omits the top pixel so that
-            // if the previous item draws it's border there we don't overwrite it.
-            path.moveTo(l, t + 1);
-            path.lineTo(r, t + 1);
-            path.lineTo(r, b);
-            path.lineTo(l, b);
-            path.close();
-
-            Paint paint = mPaint;
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(0xffffffff);
-            c.drawPath(path, paint);
-
             super.dispatchDraw(c);
 
             path.reset();
 
             r -= 1;
 
-
             // This block of code draws the border around the "message block" section
             // of the layout.  This would normally be a simple rectangle but we omit
             // the border at the point of the avatar's divot.  Also, the bottom is drawn
@@ -757,6 +743,7 @@ public class MessageListItem extends LinearLayout implements
                 path.lineTo(r, t + mAvatar.getFarOffset());
             }
 
+            Paint paint = mPaint;
 //            paint.setColor(0xff00ff00);
             paint.setColor(0xffcccccc);
             paint.setStrokeWidth(1F);