Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df96f1a0 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

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

parents d29f8115 ae9917f9
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -394,7 +394,11 @@ public class ContactListItemView extends ViewGroup
        }

        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();
        }