commit df96f1a0287f3915b8f84c82acd43d5334b69653
author Daisuke Miyakawa <dmiyakawa@google.com> Fri Oct 28 07:24:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 28 07:24:13 2011 -0700
tree 2f2e9ba64bcd3e7deee18a0803a051f5ba1ec061
parent d29f81158007ddb809e3d47b42b549102a2026f2
parent ae9917f957e431f43140720c24000df30518d020

Merge "Use AT_MOST for label when photo is on right" into ics-mr1

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 eb31e2a..5617664 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -394,7 +394,11 @@
         }
 
         if (isVisible(mLabelView)) {
-            mLabelView.measure(MeasureSpec.makeMeasureSpec(labelWidth, MeasureSpec.EXACTLY),
+            // For performance reason we don't want AT_MOST usually, but when the picture is
+            // on right, we need to use it anyway because mDataView is next to mLabelView.
+            final int mode = (mPhotoPosition == PhotoPosition.LEFT
+                    ? MeasureSpec.EXACTLY : MeasureSpec.AT_MOST);
+            mLabelView.measure(MeasureSpec.makeMeasureSpec(labelWidth, mode),
                     MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
             mLabelViewHeight = mLabelView.getMeasuredHeight();
         }