Merge "Add new strings for new features and bug fixes"
diff --git a/res/layout/quickcontact_list_item.xml b/res/layout/quickcontact_list_item.xml
index c018eea..5a1643c 100755
--- a/res/layout/quickcontact_list_item.xml
+++ b/res/layout/quickcontact_list_item.xml
@@ -43,7 +43,7 @@
android:id="@android:id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/primary_text_color"
+ android:textColor="@color/secondary_text_color"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
@@ -64,4 +64,10 @@
android:background="?android:attr/selectableItemBackground"
android:duplicateParentState="false"
android:nextFocusLeft="@id/actions_view_container" />
+ <View
+ android:id="@+id/vertical_divider"
+ android:layout_width="1dip"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical"
+ android:background="?android:attr/dividerVertical" />
</LinearLayout>
diff --git a/src/com/android/contacts/quickcontact/QuickContactListFragment.java b/src/com/android/contacts/quickcontact/QuickContactListFragment.java
index 962f07f..5dd9db7 100644
--- a/src/com/android/contacts/quickcontact/QuickContactListFragment.java
+++ b/src/com/android/contacts/quickcontact/QuickContactListFragment.java
@@ -21,6 +21,7 @@
import android.app.Fragment;
import android.os.Bundle;
import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -125,7 +126,13 @@
}
text1.setText(action.getBody());
- text2.setText(action.getSubtitle());
+ CharSequence subtitle = action.getSubtitle();
+ text2.setText(subtitle);
+ if (TextUtils.isEmpty(subtitle)) {
+ text2.setVisibility(View.GONE);
+ } else {
+ text2.setVisibility(View.VISIBLE);
+ }
return resultView;
}