Merge "Fix keyboard selectors for tabs. Replace assets by xml files" into jb-mr1-dev
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 74e6a0a..5870b48 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -412,9 +412,9 @@
<string name="take_photo" msgid="7496128293167402354">"Tirar fotografia"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tirar nova fotografia"</string>
<string name="pick_photo" msgid="3746334626214970837">"Escolher fotografia da Galeria"</string>
- <string name="pick_new_photo" msgid="7962368009197147617">"Seleccionar nova fotografia da Galeria"</string>
- <string name="locale_change_in_progress" msgid="7583992153091537467">"A lista de contactos está a ser actualizada para reflectir a alteração do idioma."</string>
- <string name="upgrade_in_progress" msgid="474511436863451061">"A lista de contactos está a ser actualizada."</string>
+ <string name="pick_new_photo" msgid="7962368009197147617">"Selecionar nova fotografia da Galeria"</string>
+ <string name="locale_change_in_progress" msgid="7583992153091537467">"A lista de contactos está a ser atualizada para reflectir a alteração do idioma."</string>
+ <string name="upgrade_in_progress" msgid="474511436863451061">"A lista de contactos está a ser atualizada."</string>
<string name="upgrade_out_of_memory" msgid="1209994418877625940">"Os contactos estão em processo de atualização. "\n\n"O processo de atualização requer aproximadamente <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB de armazenamento interno."\n\n"Escolha uma das seguintes opções:"</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Desinstalar algumas aplicações"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Repetir actualização"</string>
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index 87c321e..cde1215 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -573,6 +573,15 @@
PhoneDataItem phone = (PhoneDataItem) dataItem;
// Build phone entries
entry.data = phone.getFormattedPhoneNumber();
+ if (entry.data == null) {
+ // This case happens when the quick contact was opened from the contact
+ // list, and then, the user touches the quick contact image and brings the
+ // user to the detail card. In this case, the Contact object that was
+ // loaded from quick contacts does not contain the formatted phone number,
+ // so it must be loaded here.
+ phone.computeFormattedPhoneNumber(mDefaultCountryIso);
+ entry.data = phone.getFormattedPhoneNumber();
+ }
final Intent phoneIntent = mHasPhone ?
ContactsUtils.getCallIntent(entry.data) : null;
final Intent smsIntent = mHasSms ? new Intent(Intent.ACTION_SENDTO,