commit 2c4eb4f28fd84c43e7cd605adbe1970f75f18f85
author Baligh Uddin <baligh@google.com> Mon Oct 01 17:08:58 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 01 17:08:59 2012 -0700
tree 37297a24ed8aa9f96f942108448e2ea3134e52ad
parent b7fe953a740380e2f6b6caa0ce75bfae46d76cb3
parent 57e239071f6e43bea7a9fc8852d8451392172f99

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

src/com/android/contacts/list/ContactListItemView.java

diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index bfe06b0..4b2e254 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -306,8 +306,13 @@
         // Also calculate their heights to get the total height for this entire view.
 
         if (isVisible(mNameTextView)) {
+            // Caculate width for name text - this parallels similar measurement in onLayout.
+            int nameTextWidth = effectiveWidth;
+            if (mPhotoPosition != PhotoPosition.LEFT) {
+                nameTextWidth -= mTextIndent;
+            }
             mNameTextView.measure(
-                    MeasureSpec.makeMeasureSpec(effectiveWidth, MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(nameTextWidth, MeasureSpec.EXACTLY),
                     MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
             mNameTextViewHeight = mNameTextView.getMeasuredHeight();
         }