merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I5263a74da476e96ac630f016f1814edfdfaf9230
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1fae984..09bdb1d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
android:sharedUserId="android.uid.shared"
+ android:sharedUserLabel="@string/sharedUserLabel"
>
<original-package android:name="com.android.contacts" />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9a1220c..4e0a0d9 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fda1382..6d9d0cf 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android-kerneprogrammer"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e32ad20..42d5c14 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakte"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -173,7 +174,7 @@
<string name="toast_call_detail_error" msgid="7200975244804730096">"Details für den angeforderten Anruf konnten nicht gelesen werden."</string>
<string name="type_incoming" msgid="6502076603836088532">"Eingehender Anruf"</string>
<string name="type_outgoing" msgid="343108709599392641">"Ausgehender Anruf"</string>
- <string name="type_missed" msgid="2720502601640509542">"Verpasster Anruf"</string>
+ <string name="type_missed" msgid="2720502601640509542">"Entgangener Anruf"</string>
<string name="actionIncomingCall" msgid="6028930669817038600">"Eingehende Anrufe"</string>
<string name="callBack" msgid="5498224409038809224">"Rückruf"</string>
<string name="callAgain" msgid="3197312117049874778">"Erneut anrufen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ec645a5..56cf27a1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Βασικές εφαρμογές Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Επαφές"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Τηλέφωνο"</string>
<string name="shortcutContact" msgid="749243779392912958">"Επαφή"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5c430d3..70a3296 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplicaciones del núcleo de Androide"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Teléfono"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d689638..587ec84 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplicaciones básicas"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Teléfono"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index aed36e1..f72f8c5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Applications de base Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Téléphone"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9da8428..cc890cc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Contatti"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefono"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contatto"</string>
@@ -162,7 +163,7 @@
<string name="noContactsHelpTextWithSync" msgid="3734101165712848179">"Non sono presenti contatti da visualizzare (se hai appena aggiunto un account, la sincronizzazione dei contatti potrebbe richiedere alcuni minuti)."\n\n"Per aggiungere contatti, premi "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e tocca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Account"</b></font>" per aggiungere o configurare un account con contatti sincronizzabili con il telefono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opzioni di visualizzazione"</b></font>" per modificare i contatti visibili"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare da zero un nuovo contatto"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importa/esporta"</b></font>\n</li></string>
<string name="noContactsNoSimHelpText" msgid="6553845386917463292">"Non sono presenti contatti da visualizzare."\n\n"Per aggiungere contatti, premi "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e tocca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Account"</b></font>" per aggiungere o configurare un account con contatti sincronizzabili con il telefono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare da zero un nuovo contatto"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importa/esporta"</b></font>\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" msgid="1122296298361373488">"Non sono presenti contatti da visualizzare (se hai appena aggiunto un account, la sincronizzazione dei contatti potrebbe richiedere alcuni minuti)."\n\n"Per aggiungere contatti, premi "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e tocca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Account"</b></font>" per aggiungere o configurare un account con contatti sincronizzabili con il telefono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opzioni di visualizzazione"</b></font>" per modificare i contatti visibili"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare da zero un nuovo contatto"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importa/esporta"</b></font>\n</li></string>
- <string name="noFavoritesHelpText" msgid="3744655776704833277">"Non sono presenti preferiti."\n\n"Per aggiungere un contatto al tuo elenco di preferiti:"\n\n" "<li>"Tocca la scheda "<b>"Contatti."</b>\n</li>" "\n<li>"Tocca il contatto da aggiungere ai preferiti."\n</li>" "\n<li>"Tocca la stella accanto al nome del contatto."\n</li></string>
+ <string name="noFavoritesHelpText" msgid="3744655776704833277">"Non sono presenti preferiti."\n\n"Per aggiungere un contatto al tuo elenco di preferiti:"\n\n<li>"Tocca la scheda "<b>"Contatti."</b>\n</li>" "\n<li>"Tocca il contatto da aggiungere ai preferiti."\n</li>" "\n<li>"Tocca la stella accanto al nome del contatto."\n</li></string>
<string name="liveFolder_all_label" msgid="5961411940473276616">"Tutti i contatti"</string>
<string name="liveFolder_favorites_label" msgid="2674341514070517105">"Speciali"</string>
<string name="liveFolder_phones_label" msgid="1709786878793436245">"Telefoni"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 957aefb..fe912ab 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"連絡先"</string>
<string name="launcherDialer" msgid="8636288196618486553">"電話"</string>
<string name="shortcutContact" msgid="749243779392912958">"連絡先"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7cc424e..f98c89a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core 애플리케이션"</string>
<string name="contactsList" msgid="8661624236494819731">"주소록"</string>
<string name="launcherDialer" msgid="8636288196618486553">"휴대전화"</string>
<string name="shortcutContact" msgid="749243779392912958">"연락처"</string>
@@ -46,13 +47,13 @@
<string name="menu_viewAddress" msgid="1814744325763202024">"지도상의 주소"</string>
<string name="menu_makeDefaultNumber" msgid="4838759253316649534">"기본 번호로 설정"</string>
<string name="menu_makeDefaultEmail" msgid="2599044610375789994">"기본 이메일로 설정"</string>
- <string name="menu_splitAggregate" msgid="8368636463748691868">"분할"</string>
+ <string name="menu_splitAggregate" msgid="8368636463748691868">"분리"</string>
<string name="contactsSplitMessage" msgid="5253490235863170269">"연락처가 분할되었습니다."</string>
- <string name="splitConfirmation_title" msgid="6716467920283502570">"연락처 분할"</string>
- <string name="splitConfirmation" msgid="1150797297503944823">"연락처 하나를 여러 주소록으로 분할하시겠습니까? 가입된 연락처 정보 세트마다 하나씩 만드시겠습니까?"</string>
- <string name="menu_joinAggregate" msgid="5027981918265667970">"결합"</string>
- <string name="titleJoinContactDataWith" msgid="7684875775798635354">"연락처 결합"</string>
- <string name="blurbJoinContactDataWith" msgid="995870557595050304">"<xliff:g id="NAME">%s</xliff:g>와(과) 결합할 연락처를 선택하세요."</string>
+ <string name="splitConfirmation_title" msgid="6716467920283502570">"연락처 분리"</string>
+ <string name="splitConfirmation" msgid="1150797297503944823">"연락처 하나를 여러 주소록으로 분리하시겠습니까? 가입된 연락처 정보 세트마다 하나씩 만드시겠습니까?"</string>
+ <string name="menu_joinAggregate" msgid="5027981918265667970">"통합"</string>
+ <string name="titleJoinContactDataWith" msgid="7684875775798635354">"연락처 통합"</string>
+ <string name="blurbJoinContactDataWith" msgid="995870557595050304">"<xliff:g id="NAME">%s</xliff:g>와(과) 통합할 연락처를 선택하세요."</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"모든 연락처 표시"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"추천 연락처"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"모든 연락처"</string>
@@ -250,14 +251,14 @@
<string name="call_disambig_title" msgid="1911302597959335178">"전화 걸기:"</string>
<string name="sms_disambig_title" msgid="4675399294513152364">"다음을 사용하여 문자 보내기:"</string>
<string name="make_primary" msgid="5829291915305113983">"이 선택사항 저장"</string>
- <string name="quickcontact_missing_app" msgid="4600366393134289038">"이 작업을 처리하는 응용프로그램을 찾을 수 없습니다."</string>
+ <string name="quickcontact_missing_app" msgid="4600366393134289038">"이 작업을 처리하는 애플리케이션을 찾을 수 없습니다."</string>
<string name="quickcontact_remember_choice" msgid="5964536411579749424">"이 선택사항 저장"</string>
<string name="quickcontact_missing_name" msgid="5590266114306996632">"알 수 없음"</string>
<string name="menu_accounts" msgid="8499114602017077970">"계정"</string>
<string name="menu_import_export" msgid="3765725645491577190">"가져오기/내보내기"</string>
<string name="dialog_import_export" msgid="4771877268244096596">"연락처 가져오기/내보내기"</string>
<string name="menu_share" msgid="943789700636542260">"공유"</string>
- <string name="share_via" msgid="563121028023030093">"연락처 공유에 사용할 응용프로그램:"</string>
+ <string name="share_via" msgid="563121028023030093">"연락처 공유에 사용할 애플리케이션:"</string>
<string name="share_error" msgid="4374508848981697170">"연락처를 공유할 수 없습니다."</string>
<string name="nameLabelsGroup" msgid="2034640839640477827">"이름"</string>
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"닉네임"</string>
@@ -350,7 +351,7 @@
<string name="postal_country" msgid="7638264508416368690">"국가"</string>
<string name="name_given" msgid="1687286314106019813">"이름"</string>
<string name="name_family" msgid="3416695586119999058">"성"</string>
- <string name="name_prefix" msgid="59756378548779822">"이름 접두어"</string>
+ <string name="name_prefix" msgid="59756378548779822">"경칭"</string>
<string name="name_middle" msgid="8467433655992690326">"중간 이름"</string>
<string name="name_suffix" msgid="3855278445375651441">"이름 접미어"</string>
<string name="name_phonetic_given" msgid="6853570431394449191">"이름(소리나는 대로)"</string>
@@ -374,7 +375,7 @@
<string name="locale_change_in_progress" msgid="1124266507671178413">"변경된 언어를 반영하도록 연락처 목록을 업데이트하는 중입니다."\n\n"잠시 기다려 주세요."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"연락처 목록을 업데이트하고 있습니다."\n\n"잠시 기다려 주세요..."</string>
<string name="upgrade_out_of_memory" msgid="492151063059824962">"연락처를 업그레이드하는 중입니다. "\n\n"업그레이드 프로세스에는 약 <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>Mb의 휴대전화 내부 저장공간이 필요합니다."\n\n"다음 옵션 중 하나를 선택하세요."</string>
- <string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"일부 응용프로그램 제거"</string>
+ <string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"일부 애플리케이션 제거"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"업그레이드 다시 시도"</string>
<string name="search_results_for" msgid="8705490885073188513">"<xliff:g id="QUERY">%s</xliff:g>에 대한 검색결과"</string>
<string name="search_results_searching" msgid="7755623475227227314">"검색 중..."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 73d2e19..ea95eca 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Kjerneprogrammer for Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 22214fa..b2b08d1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android-kerntoepassingen"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacten"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefoon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacten"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aa050dd..ac25187 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplikacje główne systemu Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8a2d0a8..b18eaa7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplicações Principais do Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefone"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e53f68e..b5c9352 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Principais aplicativos do Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Contatos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefone"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contato"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 121c25a..c4b3756 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Основные приложения Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакты"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Телефон"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
@@ -350,9 +351,9 @@
<string name="postal_country" msgid="7638264508416368690">"Страна"</string>
<string name="name_given" msgid="1687286314106019813">"Имя"</string>
<string name="name_family" msgid="3416695586119999058">"Фамилия"</string>
- <string name="name_prefix" msgid="59756378548779822">"Префикс имени"</string>
+ <string name="name_prefix" msgid="59756378548779822">"Форма обращения"</string>
<string name="name_middle" msgid="8467433655992690326">"Отчество"</string>
- <string name="name_suffix" msgid="3855278445375651441">"Суффикс имени"</string>
+ <string name="name_suffix" msgid="3855278445375651441">"Звание/титул"</string>
<string name="name_phonetic_given" msgid="6853570431394449191">"Имя (транскрипция)"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Отчество (транскрипция)"</string>
<string name="name_phonetic_family" msgid="462095502140180305">"Фамилия (транскрипция)"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 1a68355..dace27a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b360da8..f169128 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kişiler"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kişi"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 65af296..ecdfee5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android 核心应用程序"</string>
<string name="contactsList" msgid="8661624236494819731">"通讯录"</string>
<string name="launcherDialer" msgid="8636288196618486553">"拨号"</string>
<string name="shortcutContact" msgid="749243779392912958">"联系人"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4f0c93e..4427eaf 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android 核心應用程式"</string>
<string name="contactsList" msgid="8661624236494819731">"聯絡人"</string>
<string name="launcherDialer" msgid="8636288196618486553">"電話"</string>
<string name="shortcutContact" msgid="749243779392912958">"聯絡人"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31e64c3..facf34c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,6 +14,10 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Label for this app's shared user ID (and thus for all other
+ apps sharing the uid). -->
+ <string name="sharedUserLabel">Android Core Apps</string>
+
<!-- Title for the activity that shows contacts. This is the name
used in the Launcher icon. -->
<string name="contactsList">Contacts</string>
diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 07927de..53c59f3 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -302,6 +302,7 @@
if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
// see if we are "adding a call" from the InCallScreen; false by default.
mIsAddCallMode = intent.getBooleanExtra(ADD_CALL_MODE_KEY, false);
+
Uri uri = intent.getData();
if (uri != null) {
if ("tel".equals(uri.getScheme())) {
@@ -324,6 +325,16 @@
}
}
}
+ } else {
+ // ACTION_DIAL or ACTION_VIEW with no data.
+ // This behaves basically like ACTION_MAIN: If there's
+ // already an active call, bring up an intermediate UI to
+ // make the user confirm what they really want to do.
+ // Be sure *not* to show the dialpad chooser if this is an
+ // explicit "Add call" action, though.
+ if (!mIsAddCallMode && phoneIsInUse()) {
+ needToShowDialpadChooser = true;
+ }
}
} else if (Intent.ACTION_MAIN.equals(action)) {
// The MAIN action means we're bringing up a blank dialer
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index ead6a4a..a4a0892 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -782,7 +782,7 @@
int index = mListView.getSelectedItemPosition();
if (index != -1) {
ViewEntry entry = ViewAdapter.getEntry(mSections, index, SHOW_SEPARATORS);
- if (entry != null &&
+ if (entry != null && entry.intent != null &&
entry.intent.getAction() == Intent.ACTION_CALL_PRIVILEGED) {
startActivity(entry.intent);
return true;