Merge change 25646 into eclair
* changes:
Make RecentCallsListActivity#formatPhoneNumber() ignore null or empty phone number.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c9d8603..fcb6d1e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -360,7 +360,7 @@
<string name="listSeparatorCallNumber_edit">Phone numbers</string>
<!-- Separator in the contact details list describing that the items below it will send an SMS/MMS to a phone number -->
- <string name="listSeparatorSendSmsMms">Send SMS/MMS</string>
+ <string name="listSeparatorSendSmsMms">Send Text</string>
<!-- Separator in the contact details list describing that the items below it will send an email -->
<string name="listSeparatorSendEmail">Send email</string>
@@ -414,7 +414,7 @@
<string name="liveFolderPhone">Contacts with phone numbers</string>
<!-- Menu item used to send an SMS or MMS message to a phone number -->
- <string name="menu_sendTextMessage">Send SMS message</string>
+ <string name="menu_sendTextMessage">Send Text message</string>
<!-- Menu item used to call a contact from the call log -->
<string name="recentCalls_callNumber">Call <xliff:g id="name">%s</xliff:g></string>
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index e150723..aa8f944 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -871,7 +871,7 @@
entry.id = id;
entry.uri = uri;
entry.mimetype = mimetype;
- entry.label = buildActionString(kind, entryValues, true);
+ entry.label = buildActionString(kind, entryValues, false);
entry.data = buildDataString(kind, entryValues);
if (kind.typeColumn != null && entryValues.containsKey(kind.typeColumn)) {
entry.type = entryValues.getAsInteger(kind.typeColumn);