Merge "Remove unwanted padding from delete button" into lmp-mr1-dev
diff --git a/res/layout/item_photo_editor.xml b/res/layout/item_photo_editor.xml
index 48af96c..e73f4e3 100644
--- a/res/layout/item_photo_editor.xml
+++ b/res/layout/item_photo_editor.xml
@@ -22,8 +22,8 @@
android:orientation="horizontal"
>
<FrameLayout
- android:layout_width="48dip"
- android:layout_height="48dip"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
>
<ImageView
android:id="@+id/photo"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5163525..21d7fad 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Wys alle"</string>
<string name="menu_select_all" msgid="621719255150713545">"Kies alle"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Ontkies almal"</string>
- <string name="add_field" msgid="2384260056674995230">"Voeg nog \'n veld by"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Voeg nuwe by"</string>
<string name="add_organization" msgid="7311893231158291197">"Voeg organisasie by"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5abe4ca..0c905d0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"ሁሉንም አሳይ"</string>
<string name="menu_select_all" msgid="621719255150713545">"ሁሉንም ምረጥ"</string>
<string name="menu_select_none" msgid="7093222469852132345">"ሁሉንም አትምረጥ"</string>
- <string name="add_field" msgid="2384260056674995230">"ሌላ መስክ አክል"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"አዲስ አክል"</string>
<string name="add_organization" msgid="7311893231158291197">"ድርጅት አክል"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"ቀን"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6d41003..a040ef2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"عرض الكل"</string>
<string name="menu_select_all" msgid="621719255150713545">"تحديد الكل"</string>
<string name="menu_select_none" msgid="7093222469852132345">"إلغاء تحديد الكل"</string>
- <string name="add_field" msgid="2384260056674995230">"إضافة حقل آخر"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"إضافة جديد"</string>
<string name="add_organization" msgid="7311893231158291197">"إضافة مؤسسة"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"التاريخ"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 86351e3..671c982 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Показване на всички"</string>
<string name="menu_select_all" msgid="621719255150713545">"Избиране на всички"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Премахване на избора от всички"</string>
- <string name="add_field" msgid="2384260056674995230">"Добавяне на друго поле"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Добавяне на нов"</string>
<string name="add_organization" msgid="7311893231158291197">"Организация: Добавяне"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index e77b176..5c59dbe 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"সকল দেখান"</string>
<string name="menu_select_all" msgid="621719255150713545">"সবগুলি নির্বাচন করুন"</string>
<string name="menu_select_none" msgid="7093222469852132345">"সবগুলি নির্বাচন মুক্ত করুন"</string>
- <string name="add_field" msgid="2384260056674995230">"আরেকটি ক্ষেত্র যোগ করুন"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"নতুন যোগ করুন"</string>
<string name="add_organization" msgid="7311893231158291197">"সংগঠন যোগ করুন"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"তারিখ"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0f23ba7..b5e688a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostra-ho tot"</string>
<string name="menu_select_all" msgid="621719255150713545">"Selecciona-ho tot"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Anul·la tota la selecció"</string>
- <string name="add_field" msgid="2384260056674995230">"Afegeix un altre camp"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Afegeix-ne un"</string>
<string name="add_organization" msgid="7311893231158291197">"Afegeix organització"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ace15a0..531d67a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Zobrazit vše"</string>
<string name="menu_select_all" msgid="621719255150713545">"Vybrat vše"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Zrušit výběr všech"</string>
- <string name="add_field" msgid="2384260056674995230">"Přidat další pole"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Přidat nové"</string>
<string name="add_organization" msgid="7311893231158291197">"Přidat organizaci"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d5b04bd..77add85 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Vis alle"</string>
<string name="menu_select_all" msgid="621719255150713545">"Vælg alle"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Fravælg alle"</string>
- <string name="add_field" msgid="2384260056674995230">"Tilføj et felt mere"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Tilføj ny"</string>
<string name="add_organization" msgid="7311893231158291197">"Tilføj organisation"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dato"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8bdd0b2..1b238e3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Alle anzeigen"</string>
<string name="menu_select_all" msgid="621719255150713545">"Alle auswählen"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Auswahl für alle aufheben"</string>
- <string name="add_field" msgid="2384260056674995230">"Weiteres Feld hinzufügen"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Hinzufügen"</string>
<string name="add_organization" msgid="7311893231158291197">"Unternehmen hinzufügen"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1e67950..edee4dd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Εμφάνιση όλων"</string>
<string name="menu_select_all" msgid="621719255150713545">"Επιλογή όλων"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Αποεπιλογή όλων"</string>
- <string name="add_field" msgid="2384260056674995230">"Προσθήκη άλλου πεδίου"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Προσθήκη νέου"</string>
<string name="add_organization" msgid="7311893231158291197">"Προσθήκη οργανισμού"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Ημερομηνία"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3ad9c0f..7ac08bf 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Show all"</string>
<string name="menu_select_all" msgid="621719255150713545">"Select all"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Unselect all"</string>
- <string name="add_field" msgid="2384260056674995230">"Add another field"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Add new"</string>
<string name="add_organization" msgid="7311893231158291197">"Add organisation"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3ad9c0f..7ac08bf 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Show all"</string>
<string name="menu_select_all" msgid="621719255150713545">"Select all"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Unselect all"</string>
- <string name="add_field" msgid="2384260056674995230">"Add another field"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Add new"</string>
<string name="add_organization" msgid="7311893231158291197">"Add organisation"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bc234a4..b7bfe3d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostrar todos"</string>
<string name="menu_select_all" msgid="621719255150713545">"Seleccionar todo"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Desmarcar todos"</string>
- <string name="add_field" msgid="2384260056674995230">"Agregar otro campo"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Agregar nuevo"</string>
<string name="add_organization" msgid="7311893231158291197">"Agregar organización"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Fecha"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 07b13e4..acc43f5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostrar todos"</string>
<string name="menu_select_all" msgid="621719255150713545">"Seleccionar todo"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Desmarcar todo"</string>
- <string name="add_field" msgid="2384260056674995230">"Añadir otro campo"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Añadir nuevo"</string>
<string name="add_organization" msgid="7311893231158291197">"Añadir organización"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Fecha"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 93daf34..dec32b6 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Kuva kõik"</string>
<string name="menu_select_all" msgid="621719255150713545">"Vali kõik"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Tühista kõikide valik"</string>
- <string name="add_field" msgid="2384260056674995230">"Lisa veel üks väli"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Lisa uus"</string>
<string name="add_organization" msgid="7311893231158291197">"Lisa organisatsioon"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Kuupäev"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 2cbc7bf..cf9b413 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Erakutsi guztiak"</string>
<string name="menu_select_all" msgid="621719255150713545">"Hautatu guztiak"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Desautatu guztiak"</string>
- <string name="add_field" msgid="2384260056674995230">"Gehitu beste eremu bat"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Gehitu beste bat"</string>
<string name="add_organization" msgid="7311893231158291197">"Gehitu erakundea"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0fd48c9..1da4dcc 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"نمایش همه"</string>
<string name="menu_select_all" msgid="621719255150713545">"انتخاب همه"</string>
<string name="menu_select_none" msgid="7093222469852132345">"لغو انتخاب همهٔ موارد"</string>
- <string name="add_field" msgid="2384260056674995230">"افزودن یک قسمت دیگر"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"افزودن مورد جدید"</string>
<string name="add_organization" msgid="7311893231158291197">"افزودن سازمان"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"تاریخ"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8901feb..ed55733 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Näytä kaikki"</string>
<string name="menu_select_all" msgid="621719255150713545">"Valitse kaikki"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Poista kaikki valinnat"</string>
- <string name="add_field" msgid="2384260056674995230">"Lisää toinen kenttä"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Lisää uusi"</string>
<string name="add_organization" msgid="7311893231158291197">"Lisää organisaatio"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Päivämäärä"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e825477..af7f746 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Tout afficher"</string>
<string name="menu_select_all" msgid="621719255150713545">"Tout sélectionner"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Tout désélectionner"</string>
- <string name="add_field" msgid="2384260056674995230">"Ajouter un champ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Ajouter"</string>
<string name="add_organization" msgid="7311893231158291197">"Ajouter une entreprise"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0e484a4..1dd3248 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Tout afficher"</string>
<string name="menu_select_all" msgid="621719255150713545">"Tout sélectionner"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Tout désélectionner"</string>
- <string name="add_field" msgid="2384260056674995230">"Ajouter un champ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Ajouter"</string>
<string name="add_organization" msgid="7311893231158291197">"Ajouter une entreprise"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index a7837fc..cad70f2 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostrar todo"</string>
<string name="menu_select_all" msgid="621719255150713545">"Seleccionar todo"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Deseleccionar todo"</string>
- <string name="add_field" msgid="2384260056674995230">"Engadir outro campo"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Engadir nova"</string>
<string name="add_organization" msgid="7311893231158291197">"Engadir organización"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fb4aa9c..07cadcf 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"सभी दिखाएं"</string>
<string name="menu_select_all" msgid="621719255150713545">"सभी को चुनें"</string>
<string name="menu_select_none" msgid="7093222469852132345">"कुछ भी ना चुनें"</string>
- <string name="add_field" msgid="2384260056674995230">"दूसरा फ़ील्ड जोड़ें"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"नया जोड़ें"</string>
<string name="add_organization" msgid="7311893231158291197">"संगठन जोड़ें"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"दिनांक"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b530b8f..35da46c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Pokaži sve"</string>
<string name="menu_select_all" msgid="621719255150713545">"Odaberi sve"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Poništi odabir svega"</string>
- <string name="add_field" msgid="2384260056674995230">"Dodaj drugo polje"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Dodaj novo"</string>
<string name="add_organization" msgid="7311893231158291197">"Dodaj organizaciju"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7428d7a..aca6b46 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Összes megjelenítése"</string>
<string name="menu_select_all" msgid="621719255150713545">"Összes kijelölése"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Összes kijelölés megszüntetése"</string>
- <string name="add_field" msgid="2384260056674995230">"Más mező hozzáadása"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Új hozzáadása"</string>
<string name="add_organization" msgid="7311893231158291197">"Szervezet hozzáadása"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dátum"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 4e04ef5..644dc68 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Ցուցադրել բոլորը"</string>
<string name="menu_select_all" msgid="621719255150713545">"Ընտրել բոլորը"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Ապանշել բոլորը"</string>
- <string name="add_field" msgid="2384260056674995230">"Ավելացնել այլ դաշտ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Ավելացնել նորը"</string>
<string name="add_organization" msgid="7311893231158291197">"Ավելացնել կազմակերպություն"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Ամսաթիվը"</string>
@@ -250,12 +249,10 @@
<string name="header_event_entry" msgid="6738250422744401460">"Միջոցառում"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Հարաբերություն"</string>
<string name="content_description_directions" msgid="2686791825798189335">"Երթուղիներ"</string>
- <!-- no translation found for content_description_recent_sms (1666389577263317445) -->
- <skip />
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"վերջին SMS-ը՝ <xliff:g id="MESSAGE_BODY">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>, սեղմեք՝ պատասխանելու համար"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"մուտքային"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ելքային"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"բաց թողնված"</string>
- <!-- no translation found for content_description_recent_call (5183800406316723676) -->
- <skip />
+ <string name="content_description_recent_call" msgid="5183800406316723676">"վերջին զանգը՝ <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>, սեղմեք՝ հետ զանգելու համար"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Դուք՝ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 64b0bb8..2445aeb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Tampilkan semua"</string>
<string name="menu_select_all" msgid="621719255150713545">"Pilih semua"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Batal pilih semua"</string>
- <string name="add_field" msgid="2384260056674995230">"Tambahkan bidang lain"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Tambah baru"</string>
<string name="add_organization" msgid="7311893231158291197">"Tambahkan organisasi"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tanggal"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 5483574..1cfbf16 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Sýna alla"</string>
<string name="menu_select_all" msgid="621719255150713545">"Velja alla"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Velja enga"</string>
- <string name="add_field" msgid="2384260056674995230">"Bæta nýjum reit við"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Bæta nýjum við"</string>
<string name="add_organization" msgid="7311893231158291197">"Bæta fyrirtæki við"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dagsetning"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 611dbfc..1fda643 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostra tutto"</string>
<string name="menu_select_all" msgid="621719255150713545">"Seleziona tutto"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Deseleziona tutto"</string>
- <string name="add_field" msgid="2384260056674995230">"Aggiungi un altro campo"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Aggiungi nuovo"</string>
<string name="add_organization" msgid="7311893231158291197">"Aggiungi organizzazione"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5cf919f..7aa5f5c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"הצג הכל"</string>
<string name="menu_select_all" msgid="621719255150713545">"בחר הכל"</string>
<string name="menu_select_none" msgid="7093222469852132345">"בטל בחירה של הכל"</string>
- <string name="add_field" msgid="2384260056674995230">"הוסף שדה נוסף"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"הוסף חדש"</string>
<string name="add_organization" msgid="7311893231158291197">"הוסף ארגון"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"תאריך"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 03b6de6..6ed663d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"すべて表示"</string>
<string name="menu_select_all" msgid="621719255150713545">"すべて選択"</string>
<string name="menu_select_none" msgid="7093222469852132345">"選択をすべて解除"</string>
- <string name="add_field" msgid="2384260056674995230">"別の項目を追加"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"新しく追加"</string>
<string name="add_organization" msgid="7311893231158291197">"所属を追加"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"日付"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 31484c1..bf38a2c 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"ყველას ჩვენება"</string>
<string name="menu_select_all" msgid="621719255150713545">"ყველას არჩევა"</string>
<string name="menu_select_none" msgid="7093222469852132345">"ყველა არჩევანის გაუქმება"</string>
- <string name="add_field" msgid="2384260056674995230">"სხვა ველის დამატება"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"ახლის დამატება"</string>
<string name="add_organization" msgid="7311893231158291197">"ორგანიზაციის დამატება"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"თარიღი"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index d616aa7..867a31d 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Барлығын көрсету"</string>
<string name="menu_select_all" msgid="621719255150713545">"Барлығын таңдау"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Барлығының таңдау белгісін алу"</string>
- <string name="add_field" msgid="2384260056674995230">"Тағы бір алаң қосу"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Жаңа қосу"</string>
<string name="add_organization" msgid="7311893231158291197">"Ұйым қосу"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Күні"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index fc3db79..820bfff 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"បង្ហាញទាំងអស់"</string>
<string name="menu_select_all" msgid="621719255150713545">"ជ្រើសទាំងអស់"</string>
<string name="menu_select_none" msgid="7093222469852132345">"មិនជ្រើសទាំងអស់"</string>
- <string name="add_field" msgid="2384260056674995230">"បន្ថែមវាលផ្សេងទៀត"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"បន្ថែមថ្មី"</string>
<string name="add_organization" msgid="7311893231158291197">"បន្ថែមស្ថាប័ន"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"កាលបរិច្ឆេទ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 924a018..3b3e9ae 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"ಎಲ್ಲ ತೋರಿಸು"</string>
<string name="menu_select_all" msgid="621719255150713545">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="menu_select_none" msgid="7093222469852132345">"ಎಲ್ಲವನ್ನು ಆಯ್ಕೆ ರದ್ದುಮಾಡಿ"</string>
- <string name="add_field" msgid="2384260056674995230">"ಮತ್ತೊಂದು ಕ್ಷೇತ್ರವನ್ನು ಸೇರಿಸಿ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"ಹೊಸದನ್ನು ಸೇರಿಸಿ"</string>
<string name="add_organization" msgid="7311893231158291197">"ಸಂಸ್ಥೆಯನ್ನು ಸೇರಿಸಿ"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"ದಿನಾಂಕ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ba875f3..7d90803 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"모두 표시"</string>
<string name="menu_select_all" msgid="621719255150713545">"모두 선택"</string>
<string name="menu_select_none" msgid="7093222469852132345">"모두 선택취소"</string>
- <string name="add_field" msgid="2384260056674995230">"다른 입력란 추가"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"새로 추가"</string>
<string name="add_organization" msgid="7311893231158291197">"조직 추가"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"날짜"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 54b73bc..6aa8a4f 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -214,8 +214,6 @@
<skip />
<!-- no translation found for menu_select_none (7093222469852132345) -->
<skip />
- <!-- no translation found for add_field (2384260056674995230) -->
- <skip />
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Жаңысын кошуу"</string>
<string name="add_organization" msgid="7311893231158291197">"Уюм кошуу"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 35e08a7..9ef4564 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"ສະແດງທັງໝົດ"</string>
<string name="menu_select_all" msgid="621719255150713545">"ເລືອກທັງໝົດ"</string>
<string name="menu_select_none" msgid="7093222469852132345">"ບໍ່ເລືອກທັງໝົດ"</string>
- <string name="add_field" msgid="2384260056674995230">"ເພີ່ມຊ່ອງຂໍ້ມູນອື່ນ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"ເພີ່ມໃໝ່"</string>
<string name="add_organization" msgid="7311893231158291197">"ເພີ່ມອົງກອນ"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"ວັນທີ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 21c69cc..360ce36 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Rodyti visus"</string>
<string name="menu_select_all" msgid="621719255150713545">"Pasirinkti visus"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Atšaukti visų pasirinkimą"</string>
- <string name="add_field" msgid="2384260056674995230">"Pridėti kitą lauką"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Pridėti naują"</string>
<string name="add_organization" msgid="7311893231158291197">"Pridėti organizaciją"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f721b4f..117ed0a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Rādīt visus"</string>
<string name="menu_select_all" msgid="621719255150713545">"Atlasīt visas"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Noņemt atlasi visam"</string>
- <string name="add_field" msgid="2384260056674995230">"Pievienot vēl vienu lauku"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Pievienot jaunu"</string>
<string name="add_organization" msgid="7311893231158291197">"Pievienot organizāciju"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datums"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index c832578..7c40144 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Прикажи ги сите"</string>
<string name="menu_select_all" msgid="621719255150713545">"Избери ги сите"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Поништи избор на сѐ"</string>
- <string name="add_field" msgid="2384260056674995230">"Додај друга област"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Додај нов запис"</string>
<string name="add_organization" msgid="7311893231158291197">"Додај организација"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Датум"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 25173a9..baedbe7 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"എല്ലാം കാണിക്കുക"</string>
<string name="menu_select_all" msgid="621719255150713545">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
<string name="menu_select_none" msgid="7093222469852132345">"തിരഞ്ഞെടുത്തത് എല്ലാം മാറ്റുക"</string>
- <string name="add_field" msgid="2384260056674995230">"മറ്റൊരു ഫീൽഡ് ചേർക്കുക"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"പുതിയത് ചേർക്കുക"</string>
<string name="add_organization" msgid="7311893231158291197">"ഓർഗനൈസേഷൻ ചേർക്കുക"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"തീയതി"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index c8c9666..0dc4140 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Бүгдийг харуулах"</string>
<string name="menu_select_all" msgid="621719255150713545">"Бүгдийг сонгох"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Бүх сонголтыг цуцлах"</string>
- <string name="add_field" msgid="2384260056674995230">"Өөр талбар нэмэх"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Шинийг нэмэх"</string>
<string name="add_organization" msgid="7311893231158291197">"Байгууллага нэмэх"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Огноо"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 403b1df..260af5f 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"सर्व दर्शवा"</string>
<string name="menu_select_all" msgid="621719255150713545">"सर्व निवडा"</string>
<string name="menu_select_none" msgid="7093222469852132345">"सर्व निवड रद्द करा"</string>
- <string name="add_field" msgid="2384260056674995230">"दुसरे फील्ड जोडा"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"नवीन जोडा"</string>
<string name="add_organization" msgid="7311893231158291197">"संस्था जोडा"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"तारीख"</string>
@@ -250,7 +249,7 @@
<string name="header_event_entry" msgid="6738250422744401460">"इव्हेंट"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"संबंध"</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थानाचे दिशानिर्देश"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"अलीकडील sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. प्रतिसाद देण्यासाठी क्लिक करा"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"अलीकडील एसएमएस. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. प्रतिसाद देण्यासाठी क्लिक करा"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"येणारे"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"केले जाणारे"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"सुटलेले"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 50805cb..5dab44d 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Tunjukkan semua"</string>
<string name="menu_select_all" msgid="621719255150713545">"Pilih semua"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Nyahpilih semua"</string>
- <string name="add_field" msgid="2384260056674995230">"Tambah medan lain"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Tambah baru"</string>
<string name="add_organization" msgid="7311893231158291197">"Tambah organisasi"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tarikh"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index c5b12dd..c2319e0 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"အားလုံးကို ပြသရန်"</string>
<string name="menu_select_all" msgid="621719255150713545">"အားလုံးရွေးရန်"</string>
<string name="menu_select_none" msgid="7093222469852132345">"အားလုံးရွေးထားမှု ဖျက်ပါ"</string>
- <string name="add_field" msgid="2384260056674995230">"တစ်ခြားအချက်အလက် ထည့်မယ်"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"အသစ်ထည့်ရန်"</string>
<string name="add_organization" msgid="7311893231158291197">"အဖွဲ့အစည်းထည့်ရန်"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"ရက်စွဲ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8f95b24..ad1fc3b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Vis alle"</string>
<string name="menu_select_all" msgid="621719255150713545">"Marker alle"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Fjern alle markeringer"</string>
- <string name="add_field" msgid="2384260056674995230">"Legg til et annet felt"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Legg til ny"</string>
<string name="add_organization" msgid="7311893231158291197">"Legg til organisasjon"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dato"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 6d74ec0..8f4b87b 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"सबै देखाउनुहोस्"</string>
<string name="menu_select_all" msgid="621719255150713545">"सबैलाई चयन गर्नुहोस्"</string>
<string name="menu_select_none" msgid="7093222469852132345">"सबैलाई अचयन गर्नुहोस्"</string>
- <string name="add_field" msgid="2384260056674995230">"अर्को फिल्ड थप्नुहोस्"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"नयाँ खाता थप्नुहोस्"</string>
<string name="add_organization" msgid="7311893231158291197">"संगठन थप्नुहोस्"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"मिति"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c910e3e..8a55b2f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Alles weergeven"</string>
<string name="menu_select_all" msgid="621719255150713545">"Alles selecteren"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Selectie ongedaan maken"</string>
- <string name="add_field" msgid="2384260056674995230">"Nog een veld toevoegen"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Nieuw toevoegen"</string>
<string name="add_organization" msgid="7311893231158291197">"Organisatie toevoegen"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cf5c70c..8815ec4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Pokaż wszystkie"</string>
<string name="menu_select_all" msgid="621719255150713545">"Wybierz wszystko"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Anuluj wybór wszystkich"</string>
- <string name="add_field" msgid="2384260056674995230">"Dodaj inne pole"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Dodaj nowy"</string>
<string name="add_organization" msgid="7311893231158291197">"Dodaj organizację"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f37e9fc..82bd7fb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostrar tudo"</string>
<string name="menu_select_all" msgid="621719255150713545">"Selecionar tudo"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Desmarcar tudo"</string>
- <string name="add_field" msgid="2384260056674995230">"Adicionar outro campo"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Adicionar novo"</string>
<string name="add_organization" msgid="7311893231158291197">"Adicionar entidade"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 57b90ae..a662652 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Mostrar todos"</string>
<string name="menu_select_all" msgid="621719255150713545">"Selecionar todos"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Desmarcar todos"</string>
- <string name="add_field" msgid="2384260056674995230">"Adicionar outro campo"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Adicionar novo"</string>
<string name="add_organization" msgid="7311893231158291197">"Adicionar organização"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3fb0cac..d740fc8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Afişaţi-i pe toţi"</string>
<string name="menu_select_all" msgid="621719255150713545">"Selectaţi-le pe toate"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Deselectaţi-le pe toate"</string>
- <string name="add_field" msgid="2384260056674995230">"Adăugaţi alt câmp"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Adăugaţi intrare nouă"</string>
<string name="add_organization" msgid="7311893231158291197">"Adăugaţi o organizaţie"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dată"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9f751c9..931e86b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Показать все"</string>
<string name="menu_select_all" msgid="621719255150713545">"Выбрать все"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Снять все выделения"</string>
- <string name="add_field" msgid="2384260056674995230">"Добавить поле"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Добавить"</string>
<string name="add_organization" msgid="7311893231158291197">"Добавить организацию"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 4bdda6f..ff6cf82 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"සියල්ල පෙන්වන්න"</string>
<string name="menu_select_all" msgid="621719255150713545">"සියල්ල තෝරන්න"</string>
<string name="menu_select_none" msgid="7093222469852132345">"සියල්ල තේරීම ඉවත් කරන්න"</string>
- <string name="add_field" msgid="2384260056674995230">"තවත් ක්ෂේත්රයක් එක් කරන්න"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"නව දෙයක් එක් කරන්න"</string>
<string name="add_organization" msgid="7311893231158291197">"සංවිධානය එක් කරන්න"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"දිනය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d7ebd75..0698eb7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Zobraziť všetky"</string>
<string name="menu_select_all" msgid="621719255150713545">"Vybrať všetko"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Zrušiť výber všetkých"</string>
- <string name="add_field" msgid="2384260056674995230">"Pridať ďalšie pole"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Pridať nové"</string>
<string name="add_organization" msgid="7311893231158291197">"Pridať organizáciu"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dátum"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f99bbd0..dcce1c1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Pokaži vse"</string>
<string name="menu_select_all" msgid="621719255150713545">"Izberi vse"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Prekliči izbor vseh"</string>
- <string name="add_field" msgid="2384260056674995230">"Dodaj drugo polje"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Dodaj novo"</string>
<string name="add_organization" msgid="7311893231158291197">"Dodaj organizacijo"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 742609d..f5fc070 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Прикажи све"</string>
<string name="menu_select_all" msgid="621719255150713545">"Изабери све"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Поништи све изборе"</string>
- <string name="add_field" msgid="2384260056674995230">"Додај друго поље"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Додај ново"</string>
<string name="add_organization" msgid="7311893231158291197">"Додај организацију"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Датум"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 84fdc2b..ac4f6b7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Visa alla"</string>
<string name="menu_select_all" msgid="621719255150713545">"Markera alla"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Avmarkera alla"</string>
- <string name="add_field" msgid="2384260056674995230">"Lägg till ett fält"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Lägg till ny"</string>
<string name="add_organization" msgid="7311893231158291197">"Lägg till organisation"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e4a8a46..f9e8be9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Onyesha zote"</string>
<string name="menu_select_all" msgid="621719255150713545">"Chagua zote"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Usichague zozote"</string>
- <string name="add_field" msgid="2384260056674995230">"Ongeza sehemu nyingine"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Ongeza mpya"</string>
<string name="add_organization" msgid="7311893231158291197">"Ongeza shirika"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tarehe"</string>
@@ -254,6 +253,6 @@
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"zinazoingia"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"zinazotoka"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ulizokosa kupokea"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"simu ya hivi majuzi. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. bofya ili upige simu"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"simu ya hivi karibuni. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. bofya ili upige simu"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Wewe: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 5f0d6f6..17d4b4f 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"அனைத்தையும் காட்டு"</string>
<string name="menu_select_all" msgid="621719255150713545">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
<string name="menu_select_none" msgid="7093222469852132345">"எல்லாவற்றையும் தேர்வுநீக்கு"</string>
- <string name="add_field" msgid="2384260056674995230">"வேறொரு கலத்தைச் சேர்"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"புதியதைச் சேர்"</string>
<string name="add_organization" msgid="7311893231158291197">"நிறுவனத்தைச் சேர்"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"தேதி"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 35ef176..5f4d414 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"అన్నీ చూపు"</string>
<string name="menu_select_all" msgid="621719255150713545">"అన్నింటినీ ఎంచుకోండి"</string>
<string name="menu_select_none" msgid="7093222469852132345">"అన్నింటి ఎంపికను తీసివేయి"</string>
- <string name="add_field" msgid="2384260056674995230">"మరో ఫీల్డ్ను జోడించు"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"కొత్తదాన్ని జోడించు"</string>
<string name="add_organization" msgid="7311893231158291197">"సంస్థను జోడించు"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"తేదీ"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 749bc62..e6b9624 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"แสดงทั้งหมด"</string>
<string name="menu_select_all" msgid="621719255150713545">"เลือกทั้งหมด"</string>
<string name="menu_select_none" msgid="7093222469852132345">"ยกเลิกการเลือกทั้งหมด"</string>
- <string name="add_field" msgid="2384260056674995230">"เพิ่มฟิลด์อื่น"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"เพิ่มใหม่"</string>
<string name="add_organization" msgid="7311893231158291197">"เพิ่มองค์กร"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"วันที่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e84b93d..bcdefaf 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Ipakita lahat"</string>
<string name="menu_select_all" msgid="621719255150713545">"Piliin lahat"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Alisin sa pagkakapili ang lahat"</string>
- <string name="add_field" msgid="2384260056674995230">"Magdagdag ng ibang field"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Magdagdag ng bago"</string>
<string name="add_organization" msgid="7311893231158291197">"Magdagdag ng samahan"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Petsa"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5f6002e..d508385 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Tümünü göster"</string>
<string name="menu_select_all" msgid="621719255150713545">"Tümünü seç"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Tümünün seçimini kaldır"</string>
- <string name="add_field" msgid="2384260056674995230">"Başka alan ekle"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Yeni ekle"</string>
<string name="add_organization" msgid="7311893231158291197">"Kuruluş ekle"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tarih"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4fea779..edfb3c4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Показати все"</string>
<string name="menu_select_all" msgid="621719255150713545">"Вибрати все"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Скасувати все"</string>
- <string name="add_field" msgid="2384260056674995230">"Додати ще одне поле"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Додати новий запис"</string>
<string name="add_organization" msgid="7311893231158291197">"Додати організацію"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 7f9f763..2232881 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"سبھی دکھائیں"</string>
<string name="menu_select_all" msgid="621719255150713545">"سبھی کو منتخب کریں"</string>
<string name="menu_select_none" msgid="7093222469852132345">"سبھی کو غیر منتخب کریں"</string>
- <string name="add_field" msgid="2384260056674995230">"دوسری فیلڈ شامل کریں"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"نیا شامل کریں"</string>
<string name="add_organization" msgid="7311893231158291197">"تنظیم شامل کریں"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"تاریخ"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index b1dd032..4cbbaa0 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Barchasini ko‘rsatish"</string>
<string name="menu_select_all" msgid="621719255150713545">"Barchasini tanlash"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Barcha tanlashlarni bekor qilish"</string>
- <string name="add_field" msgid="2384260056674995230">"Boshqa maydon qo‘shish"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Yangisini qo‘shish"</string>
<string name="add_organization" msgid="7311893231158291197">"Tashkilot qo‘shish"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Sana"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 00b1611..20b3d18 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Hiển thị tất cả"</string>
<string name="menu_select_all" msgid="621719255150713545">"Chọn tất cả"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Bỏ chọn tất cả"</string>
- <string name="add_field" msgid="2384260056674995230">"Thêm trường khác"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Thêm mục mới"</string>
<string name="add_organization" msgid="7311893231158291197">"Thêm tổ chức"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Ngày"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0607340..f184fe6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"全部收件人"</string>
<string name="menu_select_all" msgid="621719255150713545">"全选"</string>
<string name="menu_select_none" msgid="7093222469852132345">"取消全选"</string>
- <string name="add_field" msgid="2384260056674995230">"添加其他字段"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"添加新条目"</string>
<string name="add_organization" msgid="7311893231158291197">"添加工作单位"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 83d97ed..c60cdfa 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"顯示全部"</string>
<string name="menu_select_all" msgid="621719255150713545">"全選"</string>
<string name="menu_select_none" msgid="7093222469852132345">"全部取消選取"</string>
- <string name="add_field" msgid="2384260056674995230">"新增其他欄位"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"新增"</string>
<string name="add_organization" msgid="7311893231158291197">"新增機構"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
@@ -254,6 +253,6 @@
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"來電"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"致電"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接來電"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"最近通話 (<xliff:g id="CALL_TYPE">%s</xliff:g>、<xliff:g id="PHONE_NUMBER">%s</xliff:g>、<xliff:g id="DATE">%s</xliff:g>)。按一下即可回電話"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"最近通話 (<xliff:g id="CALL_TYPE">%s</xliff:g>、<xliff:g id="PHONE_NUMBER">%s</xliff:g>、<xliff:g id="DATE">%s</xliff:g>)。按一下即可回電"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ab5f2e6..a3d3666 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"全部顯示"</string>
<string name="menu_select_all" msgid="621719255150713545">"全選"</string>
<string name="menu_select_none" msgid="7093222469852132345">"全部取消選取"</string>
- <string name="add_field" msgid="2384260056674995230">"新增其他欄位"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"新增"</string>
<string name="add_organization" msgid="7311893231158291197">"填寫聯絡人任職單位"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0411ff0..3557843 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -153,7 +153,6 @@
<string name="menu_display_all" msgid="8887488642609786198">"Bonisa konke"</string>
<string name="menu_select_all" msgid="621719255150713545">"Khetha konke"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Ungakhethi konke"</string>
- <string name="add_field" msgid="2384260056674995230">"Yengeza enye inkambu"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Faka okusha"</string>
<string name="add_organization" msgid="7311893231158291197">"Ngeza inhlangano"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Idethi"</string>
diff --git a/src/com/android/contacts/editor/BaseRawContactEditorView.java b/src/com/android/contacts/editor/BaseRawContactEditorView.java
index 7e74cfb..28261cf 100644
--- a/src/com/android/contacts/editor/BaseRawContactEditorView.java
+++ b/src/com/android/contacts/editor/BaseRawContactEditorView.java
@@ -19,9 +19,9 @@
import android.content.Context;
import android.database.Cursor;
import android.graphics.Bitmap;
+import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.RawContacts;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
@@ -46,7 +46,6 @@
public abstract class BaseRawContactEditorView extends LinearLayout {
private PhotoEditorView mPhoto;
- private boolean mHasPhotoEditor = false;
private View mBody;
private View mDivider;
@@ -77,23 +76,22 @@
/**
* Assign the given {@link Bitmap} to the internal {@link PhotoEditorView}
- * for the {@link RawContactDelta} currently being edited.
+ * in order to update the {@link RawContactDelta} currently being edited.
*/
- public void setPhotoBitmap(Bitmap bitmap) {
- mPhoto.setPhotoBitmap(bitmap);
- }
-
- protected void setHasPhotoEditor(boolean hasPhotoEditor) {
- mHasPhotoEditor = hasPhotoEditor;
- mPhoto.setVisibility(hasPhotoEditor ? View.VISIBLE : View.GONE);
+ public void setPhotoEntry(Bitmap bitmap) {
+ mPhoto.setPhotoEntry(bitmap);
}
/**
- * Return true if the current {@link RawContacts} supports {@link Photo},
- * which means that {@link PhotoEditorView} is enabled.
+ * Assign the given photo {@link Uri} to UI of the {@link PhotoEditorView}, so that it can
+ * display a full sized photo.
*/
- public boolean hasPhotoEditor() {
- return mHasPhotoEditor;
+ public void setFullSizedPhoto(Uri uri) {
+ mPhoto.setFullSizedPhoto(uri);
+ }
+
+ protected void setHasPhotoEditor(boolean hasPhotoEditor) {
+ mPhoto.setVisibility(hasPhotoEditor ? View.VISIBLE : View.GONE);
}
/**
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 23ea6af..ca7151a 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -34,7 +34,6 @@
import android.content.Loader;
import android.database.Cursor;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.media.RingtoneManager;
import android.net.Uri;
@@ -862,10 +861,10 @@
// Set up the photo handler.
bindPhotoHandler(editor, type, mState);
- // If a new photo was chosen but not yet saved, we need to
- // update the thumbnail to reflect this.
- Bitmap bitmap = updatedBitmapForRawContact(rawContactId);
- if (bitmap != null) editor.setPhotoBitmap(bitmap);
+ // If a new photo was chosen but not yet saved, we need to update the UI to
+ // reflect this.
+ final Uri photoUri = updatedPhotoUriForRawContact(rawContactId);
+ if (photoUri != null) editor.setFullSizedPhoto(photoUri);
if (editor instanceof RawContactEditorView) {
final Activity activity = getActivity();
@@ -922,14 +921,12 @@
}
/**
- * If we've stashed a temporary file containing a contact's new photo,
- * decode it and return the bitmap.
+ * If we've stashed a temporary file containing a contact's new photo, return its URI.
* @param rawContactId identifies the raw-contact whose Bitmap we'll try to return.
- * @return Bitmap of photo for specified raw-contact, or null
- */
- private Bitmap updatedBitmapForRawContact(long rawContactId) {
- String path = mUpdatedPhotos.getString(String.valueOf(rawContactId));
- return path == null ? null : BitmapFactory.decodeFile(path);
+ * @return Uru of photo for specified raw-contact, or null
+ */
+ private Uri updatedPhotoUriForRawContact(long rawContactId) {
+ return (Uri) mUpdatedPhotos.get(String.valueOf(rawContactId));
}
private void bindPhotoHandler(BaseRawContactEditorView editor, AccountType type,
@@ -1861,7 +1858,7 @@
}
if (requestingEditor != null) {
- requestingEditor.setPhotoBitmap(photo);
+ requestingEditor.setPhotoEntry(photo);
} else {
Log.w(TAG, "The contact that requested the photo is no longer present.");
}
@@ -2065,7 +2062,7 @@
*/
@Override
public void onRemovePictureChosen() {
- mEditor.setPhotoBitmap(null);
+ mEditor.setPhotoEntry(null);
// Prevent bitmap from being restored if rotate the device.
// (only if we first chose a new photo before removing it)
diff --git a/src/com/android/contacts/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
index a74e159..2f8b2a5 100644
--- a/src/com/android/contacts/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -19,13 +19,17 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.DisplayPhoto;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.android.contacts.R;
+import com.android.contacts.common.ContactPhotoManager.DefaultImageProvider;
+import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.model.RawContactDelta;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactsUtils;
@@ -44,6 +48,7 @@
private ValuesDelta mEntry;
private EditorListener mListener;
private View mTriangleAffordance;
+ private ContactPhotoManager mContactPhotoManager;
private boolean mHasSetPhoto = false;
private boolean mReadOnly;
@@ -72,6 +77,7 @@
@Override
protected void onFinishInflate() {
super.onFinishInflate();
+ mContactPhotoManager = ContactPhotoManager.getInstance(mContext);
mTriangleAffordance = findViewById(R.id.photo_triangle_affordance);
mPhotoImageView = (ImageView) findViewById(R.id.photo);
mFrameView = findViewById(R.id.frame);
@@ -111,6 +117,20 @@
mFrameView.setEnabled(isEnabled());
mHasSetPhoto = true;
mEntry.setFromTemplate(false);
+
+ if (values.getAfter() == null || values.getAfter().get(Photo.PHOTO) == null) {
+ // If the user hasn't updated the PHOTO value, then PHOTO_FILE_ID may contain
+ // a reference to a larger version of PHOTO that we can bind to the UI.
+ // Otherwise, we need to wait for a call to #setFullSizedPhoto() to update
+ // our full sized image.
+ final Integer photoFileId = values.getAsInteger(Photo.PHOTO_FILE_ID);
+ if (photoFileId != null) {
+ final Uri photoUri = DisplayPhoto.CONTENT_URI.buildUpon()
+ .appendPath(photoFileId.toString()).build();
+ setFullSizedPhoto(photoUri);
+ }
+ }
+
} else {
resetDefault();
}
@@ -127,10 +147,10 @@
}
/**
- * Assign the given {@link Bitmap} as the new value, updating UI and
- * readying for persisting through {@link ValuesDelta}.
+ * Assign the given {@link Bitmap} as the new value for the sake of building
+ * {@link ValuesDelta}. We may as well bind a thumbnail to the UI while we are at it.
*/
- public void setPhotoBitmap(Bitmap photo) {
+ public void setPhotoEntry(Bitmap photo) {
if (photo == null) {
// Clear any existing photo and return
mEntry.put(Photo.PHOTO, (byte[])null);
@@ -138,7 +158,10 @@
return;
}
- mPhotoImageView.setImageBitmap(photo);
+ final int size = ContactsUtils.getThumbnailSize(getContext());
+ final Bitmap scaled = Bitmap.createScaledBitmap(photo, size, size, false);
+
+ mPhotoImageView.setImageBitmap(scaled);
mFrameView.setEnabled(isEnabled());
mHasSetPhoto = true;
mEntry.setFromTemplate(false);
@@ -152,10 +175,29 @@
// code all over the place, because we don't have to test whether
// there is a change in EITHER the delta-list OR a changed photo...
// this way, there is always a change in the delta-list.
- final int size = ContactsUtils.getThumbnailSize(getContext());
- final Bitmap scaled = Bitmap.createScaledBitmap(photo, size, size, false);
final byte[] compressed = ContactPhotoUtils.compressBitmap(scaled);
- if (compressed != null) mEntry.setPhoto(compressed);
+ if (compressed != null) {
+ mEntry.setPhoto(compressed);
+ }
+ }
+
+ /**
+ * Bind the {@param photoUri}'s photo to editor's UI. This doesn't affect {@link ValuesDelta}.
+ */
+ public void setFullSizedPhoto(Uri photoUri) {
+ if (photoUri != null) {
+ final DefaultImageProvider fallbackToPreviousImage = new DefaultImageProvider() {
+ @Override
+ public void applyDefaultImage(ImageView view, int extent, boolean darkTheme,
+ DefaultImageRequest defaultImageRequest) {
+ // Before we finish setting the full sized image, don't change the current
+ // image that is set in any way.
+ }
+ };
+ mContactPhotoManager.loadPhoto(mPhotoImageView, photoUri,
+ mPhotoImageView.getWidth(), /* darkTheme = */ false, /* isCircular = */ false,
+ /* defaultImageRequest = */ null, fallbackToPreviousImage);
+ }
}
/**