commit b7fe953a740380e2f6b6caa0ce75bfae46d76cb3
author Raph Levien <raph@google.com> Mon Oct 01 12:09:31 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 01 12:09:32 2012 -0700
tree e9f7931abd1bbe1e6661142de413b1a5831e94bb
parent 97b4c44b642cbcc6898ffaef81ef15a8bfe39901
parent 9d578a8bb083c0aae6c0b0210a608a106cfdbbd3

Merge "Fix bug 7250807 Ellipsizing is broken" 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();
         }