merge in jb-release history after reset to jb-dev
diff --git a/res/layout/item_group_membership.xml b/res/layout/item_group_membership.xml
index 47f99b2..91480cc 100644
--- a/res/layout/item_group_membership.xml
+++ b/res/layout/item_group_membership.xml
@@ -16,6 +16,7 @@
<com.android.contacts.editor.GroupMembershipView
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/group_membership_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8a2b9cf..5920df9 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Name van jou kontakte"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Voeg 2-sek.-pouse by"</string>
<string name="add_wait" msgid="3360818652790319634">"Voeg wagtyd by"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Kies nommer"</string>
<string name="call_settings" msgid="7666474782093693667">"Instellings"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Kies nommer"</string>
<string name="make_primary" msgid="5829291915305113983">"Onthou hierdie keuse"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Geen program is gevind om hierdie aksie te hanteer nie."</string>
<string name="missing_name" msgid="8745511583852904385">"(Geen naam nie)"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0e186b6..a13f7ce 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"የዕውቂያዎችዎ ስሞች"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"2 ሰከንድ ፋታ አክል"</string>
<string name="add_wait" msgid="3360818652790319634">"ጠብቅአክል"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"ቁጥር ምረጥ"</string>
<string name="call_settings" msgid="7666474782093693667">"ቅንብሮች"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"ቁጥር ምረጥ"</string>
<string name="make_primary" msgid="5829291915305113983">"ይህን ምርጫ አስታውስ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ይህን እርምጃ ለማስተናገድ ምንም መተግበሪያ አልተገኘም፡፡"</string>
<string name="missing_name" msgid="8745511583852904385">"(ስም የለም)"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0f8fdcf..1d7838f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Імёны вашых кантактаў"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Дадаць 2-секундную паўзу"</string>
<string name="add_wait" msgid="3360818652790319634">"Дадаецца, чакайце"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Выбар нумару"</string>
<string name="call_settings" msgid="7666474782093693667">"Налады"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Выбар нумару"</string>
<string name="make_primary" msgid="5829291915305113983">"Запомніць гэты выбар"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не знойдзена прыкладанне для гэтага дзеяння."</string>
<string name="missing_name" msgid="8745511583852904385">"(Без назвы)"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4f8d79f..1b21643 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Noms dels contactes"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Afegeix una pausa de 2 segons"</string>
<string name="add_wait" msgid="3360818652790319634">"Afegeix espera"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Tria d\'un número"</string>
<string name="call_settings" msgid="7666474782093693667">"Configuració"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Tria d\'un número"</string>
<string name="make_primary" msgid="5829291915305113983">"Recorda aquesta selecció"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No s\'ha trobat cap aplicació per processar aquesta acció."</string>
<string name="missing_name" msgid="8745511583852904385">"(Sense nom)"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 84d8627..fdb0fa4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -110,12 +110,12 @@
<string name="groupSavedErrorToast" msgid="7984466936615304740">"Změny skupiny nelze uložit."</string>
<plurals name="listTotalPhoneContacts">
<item quantity="one" msgid="3015357862286673986">"1 kontakt s telefonním číslem"</item>
- <item quantity="other" msgid="3299954047880968205">"Počet kontaktů s telefonními čísly: <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="other" msgid="3299954047880968205">"Kontakty s telefonními čísly: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="listTotalPhoneContactsZero" msgid="6968813857632984319">"Ke kontaktům nejsou přiřazena žádná telefonní čísla"</string>
<plurals name="listTotalAllContacts">
<item quantity="one" msgid="3405747744700823280">"1 kontakt"</item>
- <item quantity="other" msgid="3578469907265375314">"Počet kontaktů: <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="other" msgid="3578469907265375314">"Kontakty: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="listTotalAllContactsZero" msgid="5513001821794568211">"Žádné kontakty."</string>
<string name="listTotalAllContactsZeroCustom" msgid="5004974705699445044">"Žádné kontakty nejsou viditelné."</string>
@@ -125,14 +125,14 @@
<string name="listSingleContact" msgid="6067813698903535563">"Jeden kontakt"</string>
<string name="listCustomView" msgid="6950713892532194050">"Kontakty ve vlastním zobrazení"</string>
<plurals name="listFoundAllContacts">
- <item quantity="one" msgid="5517063038754171134">"Počet nalezených položek: 1"</item>
- <item quantity="other" msgid="3852668542926965042">"Počet nalezených položek: <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="one" msgid="5517063038754171134">"Nalezeno: 1"</item>
+ <item quantity="other" msgid="3852668542926965042">"Nalezeno: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"Nalezeno více kontaktů než <xliff:g id="COUNT">%d</xliff:g>."</string>
<string name="listFoundAllContactsZero" msgid="7132202364587656501">"Nebyl nalezen žádný kontakt."</string>
<plurals name="searchFoundContacts">
- <item quantity="one" msgid="4826918429708286628">"Počet nalezených položek: 1"</item>
- <item quantity="other" msgid="7988132539476575389">"Počet nalezených položek: <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="one" msgid="4826918429708286628">"Nalezeno: 1"</item>
+ <item quantity="other" msgid="7988132539476575389">"Nalezeno: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="contactsAllLabel" msgid="6178225597569649305">"Vše"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupiny"</string>
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Jména vašich kontaktů"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Přidat 2s pauzu"</string>
<string name="add_wait" msgid="3360818652790319634">"Přidat čekání"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Zvolte číslo"</string>
<string name="call_settings" msgid="7666474782093693667">"Nastavení"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Zvolte číslo"</string>
<string name="make_primary" msgid="5829291915305113983">"Zapamatovat tuto volbu"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikace potřebná k provedení této akce nebyla nalezena."</string>
<string name="missing_name" msgid="8745511583852904385">"(Žádné jméno)"</string>
@@ -501,7 +499,7 @@
<string name="view_updates_from_group" msgid="1782685984905600034">"Zobrazit aktualizace"</string>
<plurals name="notification_voicemail_title">
<item quantity="one" msgid="1746619685488504230">"Hlasová schránka"</item>
- <item quantity="other" msgid="5513481419205061254">"Počet hlasových zpráv: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+ <item quantity="other" msgid="5513481419205061254">"Hlasové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"Nová hlasová zpráva – <xliff:g id="CALLER">%1$s</xliff:g>"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 946f881..df701e9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nazivi vaših kontakata"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Dodaj pauzu od 2 sek."</string>
<string name="add_wait" msgid="3360818652790319634">"Dodaj čekanje"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Odaberite broj"</string>
<string name="call_settings" msgid="7666474782093693667">"Postavke"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Odaberite broj"</string>
<string name="make_primary" msgid="5829291915305113983">"Zapamti ovaj izbor"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nije pronađena nijedna aplikacija koja može provesti ovu radnju."</string>
<string name="missing_name" msgid="8745511583852904385">"(Bez imena)"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4d67e63..31142b9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Ismerősök nevei"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"2 mp-es szünet hozzáadása"</string>
<string name="add_wait" msgid="3360818652790319634">"Várakozás hozzáadása"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Válassza ki a számot"</string>
<string name="call_settings" msgid="7666474782093693667">"Beállítások"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Válassza ki a számot"</string>
<string name="make_primary" msgid="5829291915305113983">"Választás megjegyzése"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nincs megfelelő alkalmazás a művelet elvégzésére."</string>
<string name="missing_name" msgid="8745511583852904385">"(Nincs név)"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d382e8e..20e986d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nama kontak Anda"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Tambahkan jeda 2-det"</string>
<string name="add_wait" msgid="3360818652790319634">"Tambahkan tunggu"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Pilih nomor"</string>
<string name="call_settings" msgid="7666474782093693667">"Setelan"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Pilih nomor"</string>
<string name="make_primary" msgid="5829291915305113983">"Ingat pilihan ini"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tidak ada apl yang ditemukan untuk menangani tindakan ini."</string>
<string name="missing_name" msgid="8745511583852904385">"(Tanpa nama)"</string>
@@ -296,7 +294,7 @@
<string name="share_via" msgid="563121028023030093">"Bagikan kontak melalui"</string>
<string name="share_error" msgid="948429331673358107">"Kontak ini tidak dapat dibagi."</string>
<string name="nameLabelsGroup" msgid="2034640839640477827">"Nama"</string>
- <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Nama julukan"</string>
+ <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Nama panggilan"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisasi"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Situs web"</string>
<string name="eventLabelsGroup" msgid="3695433812142818803">"Acara"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cfaf9f0..aa92a92 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"연락처 명단"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"2초 간 일시 정지 추가"</string>
<string name="add_wait" msgid="3360818652790319634">"대기 시간 추가"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"번호 선택"</string>
<string name="call_settings" msgid="7666474782093693667">"설정"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"번호 선택"</string>
<string name="make_primary" msgid="5829291915305113983">"이 선택사항 저장"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"이 작업을 처리하는 앱을 찾을 수 없습니다."</string>
<string name="missing_name" msgid="8745511583852904385">"(이름 없음)"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b773c31..d4ad835 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Namen van uw contacten"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Pauze van 2 seconden toevoegen"</string>
<string name="add_wait" msgid="3360818652790319634">"Wachten toevoegen"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Nummer kiezen"</string>
<string name="call_settings" msgid="7666474782093693667">"Instellingen"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Nummer kiezen"</string>
<string name="make_primary" msgid="5829291915305113983">"Deze keuze onthouden"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Er is geen app gevonden om deze actie uit te voeren."</string>
<string name="missing_name" msgid="8745511583852904385">"(Geen naam)"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index cb9d455..fa61131 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos contactos"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Adicionar pausa de 2 seg."</string>
<string name="add_wait" msgid="3360818652790319634">"Adicionar espera"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Selecionar número"</string>
<string name="call_settings" msgid="7666474782093693667">"Definições"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Selecionar número"</string>
<string name="make_primary" msgid="5829291915305113983">"Memorizar esta escolha"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Não foram encontradas aplicações para executar esta ação"</string>
<string name="missing_name" msgid="8745511583852904385">"(Sem nome)"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 39325d1..16d9a6e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos seus contatos"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Adicionar pausa de 2 segundos"</string>
<string name="add_wait" msgid="3360818652790319634">"Adicionar espera"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Escolher número"</string>
<string name="call_settings" msgid="7666474782093693667">"Configurações"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Escolher número"</string>
<string name="make_primary" msgid="5829291915305113983">"Lembrar desta escolha"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nenhum aplicativo foi encontrado para executar esta ação."</string>
<string name="missing_name" msgid="8745511583852904385">"Sem nome"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a3734a0..1a0180c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Имена контактов"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Добавить двухсекундную паузу"</string>
<string name="add_wait" msgid="3360818652790319634">"Добавить паузу"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Выбор номера"</string>
<string name="call_settings" msgid="7666474782093693667">"Настройки"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Выбор номера"</string>
<string name="make_primary" msgid="5829291915305113983">"Запомнить выбранное"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Действие не поддерживается ни в одном приложении."</string>
<string name="missing_name" msgid="8745511583852904385">"Имя не указано"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a976b97..fb87d2b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -280,11 +280,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Majina ya anwani zako"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Ongeza usitishaji wa sekunde 2"</string>
<string name="add_wait" msgid="3360818652790319634">"Ongeza kusubiri"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Chagua nambari"</string>
<string name="call_settings" msgid="7666474782093693667">"Mipangilio"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Chagua nambari"</string>
<string name="make_primary" msgid="5829291915305113983">"Kumbuka chaguo hili"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Hakuna programu iliyopatikana ya kushughulikia tendo hili."</string>
<string name="missing_name" msgid="8745511583852904385">"(Hakuna jina)"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index eadef40..8960231 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"ชื่อของรายชื่อในสมุดโทรศัพท์ของคุณ"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"เพิ่มช่วงคั่น 2 วินาที"</string>
<string name="add_wait" msgid="3360818652790319634">"เพิ่มการรอ"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"เลือกหมายเลข"</string>
<string name="call_settings" msgid="7666474782093693667">"การตั้งค่า"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"เลือกหมายเลข"</string>
<string name="make_primary" msgid="5829291915305113983">"จำตัวเลือกนี้"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ไม่พบแอปพลิเคชันสำหรับการทำงานนี้"</string>
<string name="missing_name" msgid="8745511583852904385">"(ไม่มีชื่อ)"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f80a6ac..2967cfc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Mga pangalan ng iyong mga contact"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Magdagdag ng pag-pause na 2-seg"</string>
<string name="add_wait" msgid="3360818652790319634">"Magdagdag ng paghihintay"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Pumili ng numero"</string>
<string name="call_settings" msgid="7666474782093693667">"Mga Setting"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Pumili ng numero"</string>
<string name="make_primary" msgid="5829291915305113983">"Tandaan ang pagpipiliang ito"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Walang natagpuang app na mangangasiwa sa pagkilos na ito."</string>
<string name="missing_name" msgid="8745511583852904385">"(Walang pangalan)"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fce0e4c..6f0e025 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Tên danh bạ của bạn"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Thêm 2 giây dừng"</string>
<string name="add_wait" msgid="3360818652790319634">"Thêm chờ"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Chọn số"</string>
<string name="call_settings" msgid="7666474782093693667">"Cài đặt"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Chọn số"</string>
<string name="make_primary" msgid="5829291915305113983">"Nhớ lựa chọn này"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Không tìm thấy ứng dụng nào để xử lý tác vụ này."</string>
<string name="missing_name" msgid="8745511583852904385">"(Không có tên)"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6f219a4..35edeeb 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Amagama othintana nabo"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Faka ukumisa okwesikhashana kwamasekhondi angu-2"</string>
<string name="add_wait" msgid="3360818652790319634">"Yengeza ukulinda"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Khetha inombolo"</string>
<string name="call_settings" msgid="7666474782093693667">"Izilungiselelo"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Khetha inombolo"</string>
<string name="make_primary" msgid="5829291915305113983">"Khumbula lokhu okukhethiwe"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ayikho insiza etholakele ukubhekana nalengxenye."</string>
<string name="missing_name" msgid="8745511583852904385">"(alikho igama)"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf4be1a..1c375e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1505,7 +1505,7 @@
<string name="create_group_dialog_title">Create new group</string>
<!-- An item in the popup list of groups that triggers creation of a contact group [CHAR LIMIT=128] -->
- <string name="create_group_item_label">[Create new group]</string>
+ <string name="create_group_item_label">Create new group</string>
<!-- Shows how many groups are from the specified account [CHAR LIMIT=15] -->
<plurals name="num_groups_in_account">
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index a92c49c..a8e8d03 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -19,6 +19,7 @@
import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.R;
import com.android.contacts.interactions.GroupCreationDialogFragment;
+import com.android.contacts.interactions.GroupCreationDialogFragment.OnGroupCreatedListener;
import com.android.contacts.model.DataKind;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
@@ -35,9 +36,11 @@
import android.util.AttributeSet;
import android.view.View;
import android.view.View.OnClickListener;
+import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
import android.widget.LinearLayout;
import android.widget.ListPopupWindow;
import android.widget.ListView;
@@ -83,19 +86,61 @@
}
}
+ /**
+ * Extends the array adapter to show checkmarks on all but the last list item for
+ * the group membership popup. Note that this is highly specific to the fact that the
+ * group_membership_list_item.xml is a CheckedTextView object.
+ */
+ private class GroupMembershipAdapter<T> extends ArrayAdapter<T> {
+
+ public GroupMembershipAdapter(Context context, int textViewResourceId) {
+ super(context, textViewResourceId);
+ }
+
+ public boolean getItemIsCheckable(int position) {
+ // Item is checkable if it is NOT the last one in the list
+ return position != getCount()-1;
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return getItemIsCheckable(position) ? 0 : 1;
+ }
+
+ @Override
+ public int getViewTypeCount() {
+ return 2;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ final View itemView = super.getView(position, convertView, parent);
+
+ // Hide the checkable drawable. This assumes that the item views
+ // are CheckedTextView objects
+ final CheckedTextView checkedTextView = (CheckedTextView)itemView;
+ if (!getItemIsCheckable(position)) {
+ checkedTextView.setCheckMarkDrawable(null);
+ }
+
+ return checkedTextView;
+ }
+ }
+
private EntityDelta mState;
private Cursor mGroupMetaData;
private String mAccountName;
private String mAccountType;
private String mDataSet;
private TextView mGroupList;
- private ArrayAdapter<GroupSelectionItem> mAdapter;
+ private GroupMembershipAdapter<GroupSelectionItem> mAdapter;
private long mDefaultGroupId;
private long mFavoritesGroupId;
private ListPopupWindow mPopup;
private DataKind mKind;
private boolean mDefaultGroupVisibilityKnown;
private boolean mDefaultGroupVisible;
+ private boolean mCreatedNewGroup;
private String mNoGroupString;
private int mPrimaryTextColor;
@@ -135,6 +180,21 @@
public void setGroupMetaData(Cursor groupMetaData) {
this.mGroupMetaData = groupMetaData;
updateView();
+ // Open up the list of groups if a new group was just created.
+ if (mCreatedNewGroup) {
+ mCreatedNewGroup = false;
+ onClick(this); // This causes the popup to open.
+ if (mPopup != null) {
+ // Ensure that the newly created group is checked.
+ int position = mAdapter.getCount() - 2;
+ ListView listView = mPopup.getListView();
+ if (!listView.isItemChecked(position)) {
+ // Newly created group is not checked, so check it.
+ listView.setItemChecked(position, true);
+ onItemClick(listView, null, position, listView.getItemIdAtPosition(position));
+ }
+ }
+ }
}
public void setState(EntityDelta state) {
@@ -144,6 +204,7 @@
mAccountName = values.getAsString(RawContacts.ACCOUNT_NAME);
mDataSet = values.getAsString(RawContacts.DATA_SET);
mDefaultGroupVisibilityKnown = false;
+ mCreatedNewGroup = false;
updateView();
}
@@ -226,7 +287,7 @@
return;
}
- mAdapter = new ArrayAdapter<GroupSelectionItem>(
+ mAdapter = new GroupMembershipAdapter<GroupSelectionItem>(
getContext(), R.layout.group_membership_list_item);
mGroupMetaData.moveToPosition(-1);
@@ -356,7 +417,16 @@
}
GroupCreationDialogFragment.show(
- ((Activity) getContext()).getFragmentManager(), mAccountType, mAccountName,
- mDataSet);
+ ((Activity) getContext()).getFragmentManager(),
+ mAccountType,
+ mAccountName,
+ mDataSet,
+ new OnGroupCreatedListener() {
+ @Override
+ public void onGroupCreated() {
+ mCreatedNewGroup = true;
+ }
+ });
}
+
}
diff --git a/src/com/android/contacts/interactions/GroupCreationDialogFragment.java b/src/com/android/contacts/interactions/GroupCreationDialogFragment.java
index 224b4a0..051dc13 100644
--- a/src/com/android/contacts/interactions/GroupCreationDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupCreationDialogFragment.java
@@ -33,16 +33,38 @@
private static final String ARG_ACCOUNT_NAME = "accountName";
private static final String ARG_DATA_SET = "dataSet";
+ public static final String FRAGMENT_TAG = "createGroupDialog";
+
+ private final OnGroupCreatedListener mListener;
+
+ public interface OnGroupCreatedListener {
+ public void onGroupCreated();
+ }
+
public static void show(
FragmentManager fragmentManager, String accountType, String accountName,
- String dataSet) {
- GroupCreationDialogFragment dialog = new GroupCreationDialogFragment();
+ String dataSet, OnGroupCreatedListener listener) {
+ GroupCreationDialogFragment dialog = new GroupCreationDialogFragment(listener);
Bundle args = new Bundle();
args.putString(ARG_ACCOUNT_TYPE, accountType);
args.putString(ARG_ACCOUNT_NAME, accountName);
args.putString(ARG_DATA_SET, dataSet);
dialog.setArguments(args);
- dialog.show(fragmentManager, "createGroup");
+ dialog.show(fragmentManager, FRAGMENT_TAG);
+ }
+
+ public GroupCreationDialogFragment() {
+ super();
+ mListener = null;
+ }
+
+ private GroupCreationDialogFragment(OnGroupCreatedListener listener) {
+ super();
+ mListener = listener;
+ }
+
+ public OnGroupCreatedListener getOnGroupCreatedListener() {
+ return mListener;
}
@Override
@@ -61,6 +83,13 @@
String accountName = arguments.getString(ARG_ACCOUNT_NAME);
String dataSet = arguments.getString(ARG_DATA_SET);
+ // Indicate to the listener that a new group will be created.
+ // If the device is rotated, mListener will become null, so that the
+ // popup from GroupMembershipView will not be shown.
+ if (mListener != null) {
+ mListener.onGroupCreated();
+ }
+
Activity activity = getActivity();
activity.startService(ContactSaveService.createNewGroupIntent(activity,
new AccountWithDataSet(accountName, accountType, dataSet), groupLabel,