commit 9079f1abda6d0fc2243395e9effce56d3290f434
author Daniel Lehmann <lehmannd@google.com> Thu Jul 28 14:14:26 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 28 14:14:26 2011 -0700
tree de6bd97a6bb9f5c35e3849daac6282ae1aafa61d
parent 4acc29e8f65e5939f72347af1b0ec3087f8bb6ec
parent b7950f9e602270686d7c9a8e019b492088860c45

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

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;