Messaging: Fix some quick message ui issues

Issue-id: CYNGNOS-1860

Change-Id: I7a8faa3bd96e81d96fa93279fb67e94ceeb44323

2 files changed, 11 insertions, 7 deletions

diff --git a/src/com/android/messaging/ui/conversation/MessageBubbleBackground.java b/src/com/android/messaging/ui/conversation/MessageBubbleBackground.java
index 4c22970..de055ba 100644
--- a/src/com/android/messaging/ui/conversation/MessageBubbleBackground.java
+++ b/src/com/android/messaging/ui/conversation/MessageBubbleBackground.java
@@ -17,6 +17,8 @@
 package com.android.messaging.ui.conversation;
 
 import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
@@ -27,8 +29,13 @@ public class MessageBubbleBackground extends LinearLayout {
 
     public MessageBubbleBackground(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mSnapWidthPixels = context.getResources().getDimensionPixelSize(
-                R.dimen.conversation_bubble_width_snap);
+        final Resources resources = context.getResources();
+        final TypedArray a = context
+                .obtainStyledAttributes(attrs, R.styleable.MessageBubbleBackground);
+        mSnapWidthPixels =
+                a.getDimensionPixelSize(R.styleable.MessageBubbleBackground_snapWidthPixels,
+                resources.getDimensionPixelSize(R.dimen.conversation_bubble_width_snap));
+        a.recycle();
     }
 
     @Override
diff --git a/src/com/cyanogenmod/messaging/ui/ConversationQuickMessageView.java b/src/com/cyanogenmod/messaging/ui/ConversationQuickMessageView.java
index 322c811..290036d 100644
--- a/src/com/cyanogenmod/messaging/ui/ConversationQuickMessageView.java
+++ b/src/com/cyanogenmod/messaging/ui/ConversationQuickMessageView.java
@@ -92,14 +92,11 @@ public class ConversationQuickMessageView extends FrameLayout implements View.On
 
         mContactIconView.measure(iconMeasureSpec, iconMeasureSpec);
 
-        final int arrowWidth =
-                getResources().getDimensionPixelSize(R.dimen.message_bubble_arrow_width);
-
         // We need to subtract contact icon width twice from the horizontal space to get
         // the max leftover space because we want the message bubble to extend no further than the
         // starting position of the message bubble in the opposite direction.
-        final int maxLeftoverSpace = horizontalSpace - mContactIconView.getMeasuredWidth() * 2
-                - arrowWidth - getPaddingLeft() - getPaddingRight();
+        final int maxLeftoverSpace = horizontalSpace - mContactIconView.getMeasuredWidth()
+                - getPaddingLeft() - getPaddingRight();
         final int messageContentWidthMeasureSpec = MeasureSpec.makeMeasureSpec(maxLeftoverSpace,
                 MeasureSpec.AT_MOST);