diff options
| -rw-r--r-- | chips/res/layout/chips_recipient_dropdown_item.xml | 29 | ||||
| -rw-r--r-- | chips/src/com/android/ex/chips/BaseRecipientAdapter.java | 12 |
2 files changed, 15 insertions, 26 deletions
diff --git a/chips/res/layout/chips_recipient_dropdown_item.xml b/chips/res/layout/chips_recipient_dropdown_item.xml index f9a5eba..c1f9f11 100644 --- a/chips/res/layout/chips_recipient_dropdown_item.xml +++ b/chips/res/layout/chips_recipient_dropdown_item.xml @@ -45,25 +45,12 @@ android:singleLine="true" android:ellipsize="end" /> </LinearLayout> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:orientation="horizontal" - android:gravity="center_vertical|right" - android:layout_marginLeft="12dip"> - <TextView - android:id="@android:id/text2" - android:textColor="@drawable/list_item_font_secondary" - android:textSize="12sp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="8dip" /> - <ImageView - android:id="@android:id/icon" - android:layout_width="48dip" - android:layout_height="48dip" - android:src="@drawable/ic_contact_picture" - android:cropToPadding="true" - android:scaleType="centerCrop" /> - </LinearLayout> + <ImageView + android:id="@android:id/icon" + android:layout_width="48dip" + android:layout_height="48dip" + android:layout_marginLeft="12dip" + android:src="@drawable/ic_contact_picture" + android:cropToPadding="true" + android:scaleType="centerCrop" /> </LinearLayout> diff --git a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java index 889d230..9ea909f 100644 --- a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java +++ b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java @@ -852,10 +852,6 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter destination = null; } - final CharSequence destinationType = Email.getTypeLabel(mContext.getResources(), - entry.getDestinationType(), entry.getDestinationLabel()).toString() - .toUpperCase(); - final View itemView = convertView != null ? convertView : mInflater.inflate(getItemLayout(), parent, false); final TextView displayNameView = @@ -871,7 +867,13 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter } else { destinationView.setText(null); } - destinationTypeView.setText(destinationType); + if (destinationTypeView != null) { + final CharSequence destinationType = Email.getTypeLabel(mContext.getResources(), + entry.getDestinationType(), entry.getDestinationLabel()).toString() + .toUpperCase(); + + destinationTypeView.setText(destinationType); + } if (entry.isFirstLevel()) { displayNameView.setVisibility(View.VISIBLE); |