summaryrefslogtreecommitdiffstats
path: root/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2011-08-26 13:01:50 -0700
committerPaul Westbrook <pwestbro@google.com>2011-08-26 13:16:16 -0700
commitd70e8c954a2f7e5f85f2a1588bc07a0500748e45 (patch)
tree3641d7b9dd51f407c99dd6b643291bd7f07d778a /chips/src/com/android/ex/chips/BaseRecipientAdapter.java
parent744a03849305a7936741b92dbdc1cc7a7a67802a (diff)
downloadandroid_frameworks_ex-d70e8c954a2f7e5f85f2a1588bc07a0500748e45.tar.gz
android_frameworks_ex-d70e8c954a2f7e5f85f2a1588bc07a0500748e45.tar.bz2
android_frameworks_ex-d70e8c954a2f7e5f85f2a1588bc07a0500748e45.zip
Remove label from chips
Bug: 5220741 Change-Id: If1c9423c253301209e7ca9af8c898891f6a8b98b
Diffstat (limited to 'chips/src/com/android/ex/chips/BaseRecipientAdapter.java')
-rw-r--r--chips/src/com/android/ex/chips/BaseRecipientAdapter.java12
1 files changed, 7 insertions, 5 deletions
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);