Merge "Implement lift-to-type for phone dialer accessibility." into jb-mr1-dev
diff --git a/res/menu-sw580dp/people_options.xml b/res/menu-sw580dp/people_options.xml
index 5d05752..aaf8988 100644
--- a/res/menu-sw580dp/people_options.xml
+++ b/res/menu-sw580dp/people_options.xml
@@ -66,4 +66,10 @@
android:id="@+id/menu_help"
android:orderInCategory="6"
android:title="@string/menu_help" />
+
+ <item
+ android:id="@+id/export_database"
+ android:title="@string/menu_export_database"
+ android:visible="false"
+ android:showAsAction="never" />
</menu>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e69f540..71ec12b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -528,8 +528,8 @@
<string name="call_log_item_count_and_date" msgid="7641933305703520787">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
<string name="group_name_hint" msgid="238359485263401293">"Nom del grup"</string>
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contac. reb. NFC"</string>
- <string name="menu_show_outgoing_only" msgid="1965570298133301970">"Mostra només les trucades sortints"</string>
- <string name="menu_show_incoming_only" msgid="7534206815238877417">"Mostra només les trucades entrants"</string>
+ <string name="menu_show_outgoing_only" msgid="1965570298133301970">"Mostra només trucades sortints"</string>
+ <string name="menu_show_incoming_only" msgid="7534206815238877417">"Mostra només trucades entrants"</string>
<string name="menu_show_missed_only" msgid="154473166059743996">"Mostra només trucades perdudes"</string>
<string name="menu_show_voicemails_only" msgid="1898421289561435703">"Mostra només missatges de veu"</string>
<string name="menu_show_all_calls" msgid="7560347482073345885">"Mostra totes les trucades"</string>
@@ -556,7 +556,7 @@
<string name="toast_displaying_all_contacts" msgid="2737388783898593875">"S\'estan mostrant tots els contactes"</string>
<string name="no_account_prompt" msgid="7061052512446855192">"Contactes funciona millor amb un Compte de Google."\n\n"• Accedeix-hi des de qualsevol navegador web."\n"• Fes una còpia de seguretat dels teus contactes."</string>
<string name="generic_no_account_prompt" msgid="7218827704367325460">"Mantén els contactes segurs encara que perdis el telèfon: sincronitza\'ls amb un servidor en línia."</string>
- <string name="generic_no_account_prompt_title" msgid="753783911899054860">"Addició d\'un compte"</string>
+ <string name="generic_no_account_prompt_title" msgid="753783911899054860">"Afegeix un compte"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"No es farà una còpia de seguretat del teu contacte nou. Vols afegir un compte que faci còpies de seguretat dels contactes en línia?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"El teu contacte nou se sincronitzarà amb <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"Pots sincronitzar el teu contacte nou amb un dels comptes següents. Quin vols utilitzar?"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 861bb80..34c67dc 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -496,7 +496,7 @@
<string name="toast_text_copied" msgid="5143776250008541719">"Maandishi yamenakiliwa"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Tupa mabadiliko yako?"</string>
<string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
- <string name="profile_display_name" msgid="4127389543625918771">"Sanidi maelezo yangu mafupi"</string>
+ <string name="profile_display_name" msgid="4127389543625918771">"Unda wasifu wangu"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Charaza jina la mtu"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Tazama visasisho"</string>
<plurals name="notification_voicemail_title">
@@ -512,7 +512,7 @@
<string name="voicemail_fetching_timout" msgid="6691792377574905201">"Haikuweza kuleta barua ya sauti."</string>
<string name="call_log_new_header" msgid="846546437517724715">"Mpya"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Nzee zaidi"</string>
- <string name="call_log_voicemail_header" msgid="3945407886667089173">"Simu zilizo na barua ya sauti tu"</string>
+ <string name="call_log_voicemail_header" msgid="3945407886667089173">"Simu zilizo na ujumbe wa sauti tu"</string>
<string name="call_log_incoming_header" msgid="2787722299753674684">"Simu zinazoingia tu"</string>
<string name="call_log_outgoing_header" msgid="761009180766735769">"Simu zinazotoka tu"</string>
<string name="call_log_missed_header" msgid="8017148056610855956">"Simu zisizojibiwa tu"</string>
@@ -553,8 +553,8 @@
<string name="description_quick_contact_for" msgid="6737516415168327789">"Mwasiliani wa haraka wa <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="call_log_empty_gecode" msgid="5588904744812100846">"-"</string>
<string name="user_profile_contacts_list_header" msgid="5582421742835006940">"Mimi"</string>
- <string name="local_profile_title" msgid="2021416826991393684">"Maelezo yangu mafupi ya ndani."</string>
- <string name="external_profile_title" msgid="8034998767621359438">"Maelezo yangu mafupi ya <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
+ <string name="local_profile_title" msgid="2021416826991393684">"Wasifu wangu wa ndani."</string>
+ <string name="external_profile_title" msgid="8034998767621359438">"Wasifu wangu wa <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
<string name="toast_displaying_all_contacts" msgid="2737388783898593875">"Inaonyesha anwani zote"</string>
<string name="no_account_prompt" msgid="7061052512446855192">"Watu wanafanya kazi vizuri wakiwa na Akaunti ya Google. "\n" "\n" • Iangalie kwa kutumia kivinjari chochote. "\n" • Tunza mawasiliano yako kwa usalama."</string>
<string name="generic_no_account_prompt" msgid="7218827704367325460">"Weka wasiliani wako salama hata ukipoteza simu yako: landanisha na huduma ya tovuti."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4d6c498..19cdcb7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -513,7 +513,7 @@
<string name="call_log_voicemail_header" msgid="3945407886667089173">"เฉพาะสายที่มีข้อความเสียง"</string>
<string name="call_log_incoming_header" msgid="2787722299753674684">"เฉพาะสายเรียกเข้า"</string>
<string name="call_log_outgoing_header" msgid="761009180766735769">"เฉพาะสายโทรออก"</string>
- <string name="call_log_missed_header" msgid="8017148056610855956">"เฉพาะสายที่ไม่ไ้ด้รับ"</string>
+ <string name="call_log_missed_header" msgid="8017148056610855956">"เฉพาะสายที่ไม่ได้รับ"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ข้อความเสียง"</string>
<string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ข้อความเสียง มีข้อความเสียงใหม่"</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"ตั้งค่าข้อความเสียงของคุณ"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f83fbca..8fce496 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -543,7 +543,7 @@
<string name="description_call_log_voicemail" msgid="4600798771975158948">"語音留言"</string>
<string name="description_add_contact" msgid="3103414772502485851">"新增聯絡人"</string>
<string name="description_view_contact" msgid="5205669345700598415">"查看聯絡人<xliff:g id="NAME">%1$s</xliff:g>"</string>
- <string name="description_call" msgid="3443678121983852666">"打電話給<xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="description_call" msgid="3443678121983852666">"撥電話給<xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_send_text_message" msgid="7803126439934046891">"傳送簡訊給<xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"未聽取的語音留言"</string>
<string name="description_send_message" msgid="6046623392322890962">"傳送訊息給<xliff:g id="NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6255e06..0960606 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -510,7 +510,7 @@
<string name="voicemail_fetching_timout" msgid="6691792377574905201">"Yehlulekile ukulanda i-voicemail."</string>
<string name="call_log_new_header" msgid="846546437517724715">"Okusha"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Okudadlana"</string>
- <string name="call_log_voicemail_header" msgid="3945407886667089173">"Amakholi ane-voicemail kuphela"</string>
+ <string name="call_log_voicemail_header" msgid="3945407886667089173">"Amakholi anevoyisimeyili kuphela"</string>
<string name="call_log_incoming_header" msgid="2787722299753674684">"Amakholi angenayo kuphela"</string>
<string name="call_log_outgoing_header" msgid="761009180766735769">"Amakholi aphumayo kuphela"</string>
<string name="call_log_missed_header" msgid="8017148056610855956">"Amakholi agejiwe kuphela"</string>
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index bfe06b0..4b2e254 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -306,8 +306,13 @@
// Also calculate their heights to get the total height for this entire view.
if (isVisible(mNameTextView)) {
+ // Caculate width for name text - this parallels similar measurement in onLayout.
+ int nameTextWidth = effectiveWidth;
+ if (mPhotoPosition != PhotoPosition.LEFT) {
+ nameTextWidth -= mTextIndent;
+ }
mNameTextView.measure(
- MeasureSpec.makeMeasureSpec(effectiveWidth, MeasureSpec.EXACTLY),
+ MeasureSpec.makeMeasureSpec(nameTextWidth, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
mNameTextViewHeight = mNameTextView.getMeasuredHeight();
}