commit b7950f9e602270686d7c9a8e019b492088860c45
author Daniel Lehmann <lehmannd@google.com> Thu Jul 28 14:02:25 2011 -0700
committer Daniel Lehmann <lehmannd@google.com> Thu Jul 28 14:02:25 2011 -0700
tree 09ef1f9c32e26fc3660893dd48b60676ecb9186d
parent d0bf62647f7e7cf86ff4319d673c6c6196f07f03

Fix NPE issue with items that don't have a subtitle (happens with Exchange)

Bug:5090824
Change-Id: I35806f25d750db66d18e82d977aaa64a02f8605c

res/layout/quickcontact_list_item.xml

diff --git a/res/layout/quickcontact_list_item.xml b/res/layout/quickcontact_list_item.xml
index f77ed3f..14d8720 100755
--- a/res/layout/quickcontact_list_item.xml
+++ b/res/layout/quickcontact_list_item.xml
@@ -41,6 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
+            android:textAllCaps="true"
             android:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
     <View

src/com/android/contacts/quickcontact/QuickContactListFragment.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactListFragment.java b/src/com/android/contacts/quickcontact/QuickContactListFragment.java
index 910fede..18c6ef5 100644
--- a/src/com/android/contacts/quickcontact/QuickContactListFragment.java
+++ b/src/com/android/contacts/quickcontact/QuickContactListFragment.java
@@ -110,7 +110,7 @@
                 alternateActionButton.setImageDrawable(action.getAlternateIcon());
 
                 text1.setText(action.getBody());
-                text2.setText(action.getSubtitle().toString().toUpperCase());
+                text2.setText(action.getSubtitle());
 
                 resultView.setTag(action);
                 return resultView;