Merge commit '9b9e7485747fe60b315aacb05c0c61b802cbc7c6' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I2a84192e94ca0eb7ec2e54d059581cac4c103a25
Merged-In: Ia8e8194028825190addbe3b2c33da2a54d83d6fc
diff --git a/res/drawable/ic_person_black_24dp.xml b/res/drawable/ic_person_black_24dp.xml
deleted file mode 100644
index 1daa2e4..0000000
--- a/res/drawable/ic_person_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="#61000000">
- <path
- android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"
- android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cac5134..389542d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -96,14 +96,14 @@
<string name="fail_add_contact" msgid="6511490846952942291">"يتعذر قراءة معلومات الاتصال على نحو سليم"</string>
<string name="remove" msgid="1243949503772376064">"إزالة"</string>
<string name="cancel" msgid="7401575239009060939">"إلغاء"</string>
- <string name="ok" msgid="163967937451981024">"حسنًا"</string>
+ <string name="ok" msgid="163967937451981024">"موافق"</string>
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"لا تتوفر معلومات حول مالك الهاتف"</string>
<string name="tap_pencil" msgid="2723698054265296934">"إذا كان هذا هاتفك، فانقر على رمز القلم لإضافة معلومات يتم عرضها هنا في حالة الطوارئ."</string>
<string name="clear_all" msgid="8899013032870561633">"مسح الكل"</string>
<string name="clear" msgid="3648880442502887163">"مسح"</string>
<string name="clear_all_message" msgid="1548432000373861295">"هل تريد مسح جميع المعلومات وجهات الاتصال؟"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"يمكن لإضافة المعلومات الطبية وجهات الاتصال أن تساعد فرق الاستجابة الفورية في حالة الطوارئ.\n\nيمكن لأي شخص قراءة هذه المعلومات من شاشة التأمين دون الحاجة لفتح قفل هاتفك."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"يمكن أن تساعد إضافة المعلومات الطبية وجهات اتصال الطوارئ أول المستجيبين في حالة الطوارئ.\n\nيمكن لأي شخص قراءة هذه المعلومات من شاشة التأمين بدون إلغاء قفل هاتفك."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"إضافة معلومات الطوارئ"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"مساعدة أول المستجيبين في العثور على المعلومات المهمة"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 03fa140..0df504d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -103,10 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
<string name="clear" msgid="3648880442502887163">"Obriši"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Želite li da obrišete sve informacije i kontakte?"</string>
- <!-- no translation found for emergency_info_footer (4694516011247606250) -->
- <skip />
- <!-- no translation found for settings_suggestion_title (2503369576806243476) -->
- <skip />
- <!-- no translation found for settings_suggestion_body (6623265155762787567) -->
- <skip />
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Ako dodate medicinske podatke i kontakte za hitne slučajeve, možete da pomognete ekipama hitnih službi u hitnim slučajevima.\n\nSvako može da pročita te podatke sa zaključanog ekrana bez otključavanja telefona."</string>
+ <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodajte informacije za hitne slučajeve"</string>
+ <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomozite ekipama hitnih službi da pronađu važne informacije"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 63b378e..2e85a60 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -103,10 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Ачысціць усё"</string>
<string name="clear" msgid="3648880442502887163">"Ачысціць"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Ачысціць усю інфармацыю і кантакты?"</string>
- <!-- no translation found for emergency_info_footer (4694516011247606250) -->
- <skip />
- <!-- no translation found for settings_suggestion_title (2503369576806243476) -->
- <skip />
- <!-- no translation found for settings_suggestion_body (6623265155762787567) -->
- <skip />
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Медыцынская інфармацыя і кантакты для экстранных сітуацый, якія вы ўведзяце, могуць быць карыснымі для асоб, якія будуць аказваць першую дапамогу ў выпадку надзвычайнай сітуацыі.\n\nЛюбы чалавек можа прачытаць яе на экране блакіроўкі, не разблакіроўваючы тэлефон."</string>
+ <string name="settings_suggestion_title" msgid="2503369576806243476">"Увядзіце даныя на надзвычайны выпадак"</string>
+ <string name="settings_suggestion_body" msgid="6623265155762787567">"Дапамажыце тым, хто будзе аказваць першую дапамогу, знайсці важную інфармацыю"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d8660ec..208cbec 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -103,10 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
<string name="clear" msgid="3648880442502887163">"Obriši"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Želite li obrisati sve informacije i kontakte?"</string>
- <!-- no translation found for emergency_info_footer (4694516011247606250) -->
- <skip />
- <!-- no translation found for settings_suggestion_title (2503369576806243476) -->
- <skip />
- <!-- no translation found for settings_suggestion_body (6623265155762787567) -->
- <skip />
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Ako dodate informacije o zdravstvenom stanju i kontakte za hitne slučajeve, možete pomoći osobama koje prve reagiraju u hitnim slučajevima.\n\nSvako može pročitati te informacije sa zaključanog ekrana, bez otključavanja uređaja."</string>
+ <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodajte informacije za hitne slučajeve"</string>
+ <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomozite prvim osobama koje će reagirati da pronađu važne informacije"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 13a221f..449bc90 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Esborra-ho tot"</string>
<string name="clear" msgid="3648880442502887163">"Esborra"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Vols esborrar tota la informació i tots els contactes?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Afegir informació mèdica i contactes d\'emergència pot ajudar els serveis d\'emergència en cas d\'urgència.\n\nQualsevol persona pot consultar aquesta informació a la pantalla de bloqueig sense desbloquejar el telèfon."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Afegir informació mèdica i contactes d\'emergència pot ser útil per als serveis d\'emergència.\n\nQualsevol persona pot consultar aquesta informació a la pantalla de bloqueig sense desbloquejar el telèfon."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Afegeix la informació d\'emergència"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Ajuda els serveis d\'emergència a trobar la informació important"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f787ad4..43867b8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -87,11 +87,11 @@
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
- <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersoner ved nødsituationer"</string>
+ <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersoner til nødsituationer"</string>
<string name="add_emergency_contact" msgid="4063577069613981029">"Tilføj kontaktperson"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"Der kunne ikke findes en kontaktpersonvælger"</string>
<string name="fail_display_contact" msgid="4128854688897045879">"Kontaktpersonen kan ikke vises"</string>
- <string name="remove_contact" msgid="6934983445723096759">"Vil du fjerne <xliff:g id="CONTACT_NAME">%1$s</xliff:g> fra kontaktpersoner ved nødsituationer?"</string>
+ <string name="remove_contact" msgid="6934983445723096759">"Vil du fjerne <xliff:g id="CONTACT_NAME">%1$s</xliff:g> fra kontaktpersoner til nødsituationer?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"Fjern kontaktperson"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"Kontaktoplysningerne kunne ikke læses korrekt"</string>
<string name="remove" msgid="1243949503772376064">"Fjern"</string>
@@ -100,10 +100,10 @@
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"Der er ingen oplysninger om telefonens ejer"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Hvis dette er din telefon, skal du trykke på blyantikonet for at tilføje information, som vises her, hvis der opstår en nødsituation"</string>
- <string name="clear_all" msgid="8899013032870561633">"Ryd alt"</string>
+ <string name="clear_all" msgid="8899013032870561633">"Ryd alle"</string>
<string name="clear" msgid="3648880442502887163">"Ryd"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontaktpersoner?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Hvis du tilføjer helbredsoplysninger og kontaktpersoner til brug i nødsituationer, kan det hjælpe førstehjælpsydere i en nødsituation.\n\nAlle kan læse disse oplysninger på din låseskærm uden at låse telefonen op."</string>
- <string name="settings_suggestion_title" msgid="2503369576806243476">"Tilføj info til nødsituationer"</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Hvis du tilføjer lægeoplysninger og kontaktpersoner til nødsituationer, kan det hjælpe førstehjælpsydere i en nødsituation.\n\nAlle kan læse disse oplysninger på din låseskærm uden at låse telefonen op."</string>
+ <string name="settings_suggestion_title" msgid="2503369576806243476">"Tilføj oplysninger i nødsituationer"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Hjælp førstehjælpsydere med at finde vigtige oplysninger"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6632439..86ce9cb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
<string name="clear" msgid="3648880442502887163">"Borrar"</string>
<string name="clear_all_message" msgid="1548432000373861295">"¿Quieres borrar toda la información y los contactos?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Agrega información médica y contactos de emergencia para ayudar a los servicios de primeros auxilios durante una urgencia.\n\nCualquier persona puede leer esta información en tu pantalla sin desbloquear el teléfono."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Agrega información médica y contactos de emergencia para ayudar a los servicios de primeros auxilios durante una urgencia.\n\nCualquier persona puede leer esta información en tu pantalla bloqueada sin desbloquear el teléfono."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Agrega información de emergencia"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Ayuda a que los servicios de primeros auxilios encuentren información importante"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e86a0e4..e999f59 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
<string name="clear" msgid="3648880442502887163">"Borrar"</string>
<string name="clear_all_message" msgid="1548432000373861295">"¿Borrar toda la información y los contactos?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Añadir información médica y contactos de emergencia puede ayudar a los servicios de primeros auxilios en las urgencias.\n\nCualquiera puede leer esta información en tu pantalla de bloqueo sin desbloquear el teléfono."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Añadir información médica y contactos de emergencia puede ayudar a los servicios de emergencia en las urgencias.\n\nCualquiera puede leer esta información en tu pantalla de bloqueo sin desbloquear el teléfono."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Añadir información de emergencia"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Ayuda a los servicios de emergencia a encontrar información importante"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1dda96a..4fa99fe 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -16,10 +16,10 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="1090682794607161063">"Información de urxencia"</string>
+ <string name="app_label" msgid="1090682794607161063">"Información de emerxencia"</string>
<string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string>
<string name="edit_medical_info" msgid="6733720353375319476">"Editar información"</string>
- <string name="edit_info" msgid="5973929805855224805">"Editar información de urxencia"</string>
+ <string name="edit_info" msgid="5973929805855224805">"Editar información de emerxencia"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
<string name="name" msgid="4286267457738861977">"Nome"</string>
@@ -87,11 +87,11 @@
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
- <string name="emergency_contacts_title" msgid="5462202017417821030">"Contactos de urxencia"</string>
+ <string name="emergency_contacts_title" msgid="5462202017417821030">"Contactos de emerxencia"</string>
<string name="add_emergency_contact" msgid="4063577069613981029">"Engadir contacto"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"Non se puido encontrar un selector de contactos"</string>
<string name="fail_display_contact" msgid="4128854688897045879">"Non se pode mostrar o contacto"</string>
- <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de urxencia?"</string>
+ <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de emerxencia?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"Eliminar contacto"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"Non se puido ler correctamente a información de contacto"</string>
<string name="remove" msgid="1243949503772376064">"Eliminar"</string>
@@ -99,11 +99,11 @@
<string name="ok" msgid="163967937451981024">"Aceptar"</string>
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"Non hai información sobre o propietario do teléfono"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"Se este é o teu teléfono, toca a icona do lapis para engadir a información que se mostrará aquí en caso de urxencia"</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"Se este é o teu teléfono, toca a icona do lapis para engadir a información que se mostrará aquí en caso de emerxencia"</string>
<string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
<string name="clear" msgid="3648880442502887163">"Borrar"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Queres borrar toda a información e os contactos?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Engadir información médica e contactos de urxencia pode axudar aos servizos de urxencia.\n\nCalquera pode ler esta información na pantalla de bloqueo sen necesidade de desbloquear o teléfono."</string>
- <string name="settings_suggestion_title" msgid="2503369576806243476">"Engade información de urxencia"</string>
- <string name="settings_suggestion_body" msgid="6623265155762787567">"Axuda aos servizos de urxencia a atopar información importante"</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Engadir información médica e contactos de emerxencia pode axudar aos servizos de emerxencia.\n\nCalquera pode ler esta información na pantalla de bloqueo sen necesidade de desbloquear o teléfono."</string>
+ <string name="settings_suggestion_title" msgid="2503369576806243476">"Engade información de emerxencia"</string>
+ <string name="settings_suggestion_body" msgid="6623265155762787567">"Axuda aos servizos de emerxencia a atopar información importante"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 997fb0c..7341672 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,9 +17,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="1090682794607161063">"आपातकालीन जानकारी"</string>
- <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सा संबंधी जानकारी"</string>
- <string name="edit_medical_info" msgid="6733720353375319476">"जानकारी में बदलाव करें"</string>
- <string name="edit_info" msgid="5973929805855224805">"आपातकालीन जानकारी में बदलाव करें"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सा जानकारी"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"जानकारी संपादित करें"</string>
+ <string name="edit_info" msgid="5973929805855224805">"आपातकालीन जानकारी संपादित करें"</string>
<string name="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"संपर्क"</string>
<string name="name" msgid="4286267457738861977">"नाम"</string>
@@ -96,14 +96,14 @@
<string name="fail_add_contact" msgid="6511490846952942291">"संपर्क की जानकारी ठीक से नहीं पढ़ी जा सकी"</string>
<string name="remove" msgid="1243949503772376064">"निकालें"</string>
<string name="cancel" msgid="7401575239009060939">"रद्द करें"</string>
- <string name="ok" msgid="163967937451981024">"ठीक है"</string>
+ <string name="ok" msgid="163967937451981024">"ठीक"</string>
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
- <string name="no_info_provided" msgid="716200382010821001">"ये जिसका फ़ोन है उसके बारे में कोई जानकारी नहीं है"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"अगर यह आपका फ़ोन है, तो आपात स्थिति में यहां दिखाई जाने वाली जानकारी जोड़ने के लिए पेंसिल आइकॉन को छूएं"</string>
+ <string name="no_info_provided" msgid="716200382010821001">"फ़ोन के स्वामी के बारे में कोई जानकारी नहीं है"</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"यदि यह आपका फ़ोन है, तो आपात स्थिति में यहां दिखाई जाने वाली जानकारी जोड़ने के लिए पेंसिल आइकन टैप करें"</string>
<string name="clear_all" msgid="8899013032870561633">"सभी साफ़ करें"</string>
<string name="clear" msgid="3648880442502887163">"साफ़ करें"</string>
<string name="clear_all_message" msgid="1548432000373861295">"सभी जानकारी और संपर्क साफ़ करें?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"चिकित्सा संबंधी जानकारी और आपातकालीन संपर्क जोड़ने से किसी आपातकालीन स्थिति में सबसे पहले प्रतिक्रिया देने वालों को मदद मिल सकती है.\n\nआपके फ़ोन को अनलॉक किए बिना कोई भी आपकी लॉक स्क्रीन से यह जानकारी पढ़ सकता है."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"चिकित्सा जानकारी और आपातकालीन संपर्क जोड़ने से किसी आपातकालीन स्थिति में पहले प्रतिक्रिया देने वालों को सहायता मिल सकती है.\n\nआपके फ़ोन को अनलॉक किए बिना कोई भी आपकी लॉक स्क्रीन से यह जानकारी पढ़ सकता है."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"आपातकालीन जानकारी जोड़ें"</string>
- <string name="settings_suggestion_body" msgid="6623265155762787567">"प्रतिक्रिया देने वालों की अहम जानकारी पाने में पहले मदद करें"</string>
+ <string name="settings_suggestion_body" msgid="6623265155762787567">"महत्वपूर्ण जानकारी पाने में पहले प्रतिक्रिया देने वालों की सहायता करें"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index d1388b8..04c0cb0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="1090682794607161063">"Անհետաձգելի բուժօգնության տվյալներ"</string>
+ <string name="app_label" msgid="1090682794607161063">"Անձնական բուժտվյալներ"</string>
<string name="medical_info_title" msgid="3000192781136934887">"Բժշկական տվյալներ"</string>
<string name="edit_medical_info" msgid="6733720353375319476">"Խմբագրել տվյալները"</string>
<string name="edit_info" msgid="5973929805855224805">"Փոփոխել անհետաձգելի բուժօգնության տվյալները"</string>
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Մաքրել բոլորը"</string>
<string name="clear" msgid="3648880442502887163">"Մաքրել"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Մաքրե՞լ բոլոր տեղեկությունները և կոնտակտները:"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Բժշկական տվյալներն ու կոնտակտները կարող են օգնել արտակարգ իրավիճակներում առաջին օգնություն ցուցաբերող անձանց:\n\nԱյդ տեղեկությունները տեսանելի են բոլորին ձեր սարքի կողպէկրանին։"</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Բժշկական տվյալների և արտակարգ իրավիճակների կոնտակտների ավելացումը կարող է օգնել արտակարգ իրավիճակների դեպքում առաջին օգնություն ցուցաբերող մարդկանց:\n\nԲոլոր կարող են կարդալ այս տեղեկությունները ձեր կողպէկրանից՝ առանց հեռախոսն ապակողպելու անհրաժեշտության:"</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Ավելացրեք արտակարգ իրավիճակների տվյալներ"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Առաջին օգնություն ցուցաբերող մարդկանց օգնեք գտնել անհրաժեշտ տեղեկությունները"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index df2a62e..f63c876 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Hapus semua"</string>
<string name="clear" msgid="3648880442502887163">"Hapus"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Hapus semua informasi dan kontak?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Menambahkan informasi medis dan kontak darurat dapat membantu penolong pertama dalam keadaan darurat.\n\nSiapa saja dapat membaca informasi ini dari kunci layar tanpa harus membuka kunci ponsel."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Menambahkan informasi medis dan kontak darurat dapat membantu responden peratama dalam keadaan darurat.\n\nSiapa saja dapat membaca informasi ini dari kunci layar tanpa harus membuka kunci ponsel."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Menambahkan informasi darurat"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Bantu responden pertama menemukan informasi penting"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 893e940..12ed671 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Fjern alt"</string>
<string name="clear" msgid="3648880442502887163">"Fjern"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Vil du fjerne alle opplysningene og kontaktene?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Hvis du legger til medisinsk informasjon og nødkontakter, kan dette brukes ved førstehjelp i nødstilfeller.\n\nHvem som helst kan lese denne informasjonen fra låseskjermen uten å låse opp telefonen din."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"Hvis du legger til medisinsk informasjon og nødkontakter, kan det hjelpe utrykningspersonell ved nødstilfeller.\n\nHvem som helst kan lese denne informasjonen fra låseskjermen uten å låse opp telefonen din."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Legg til opplysninger for nødstilfeller"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Hjelp utrykningspersonell med å finne viktig informasjon"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8ebc119..4bb3f10 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -19,7 +19,7 @@
<string name="app_label" msgid="1090682794607161063">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
<string name="medical_info_title" msgid="3000192781136934887">"ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ"</string>
<string name="edit_medical_info" msgid="6733720353375319476">"ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
- <string name="edit_info" msgid="5973929805855224805">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
+ <string name="edit_info" msgid="5973929805855224805">"ਐਮਰਜੈਂਸੀ ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
<string name="tab_title_info" msgid="1402033103294855812">"ਜਾਣਕਾਰੀ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"ਸੰਪਰਕ"</string>
<string name="name" msgid="4286267457738861977">"ਨਾਮ"</string>
@@ -90,7 +90,7 @@
<string name="emergency_contacts_title" msgid="5462202017417821030">"ਐਮਰਜੈਂਸੀ ਸੰਪਰਕ"</string>
<string name="add_emergency_contact" msgid="4063577069613981029">"ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"ਕਿਸੇ ਸੰਪਰਕ ਚੋਣਕਾਰ ਨੂੰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
- <string name="fail_display_contact" msgid="4128854688897045879">"ਸੰਪਰਕ ਪ੍ਰਦਰਸ਼ਿਤ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
+ <string name="fail_display_contact" msgid="4128854688897045879">"ਸੰਪਰਕ ਵਿਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
<string name="remove_contact" msgid="6934983445723096759">"ਕੀ <xliff:g id="CONTACT_NAME">%1$s</xliff:g> ਤੋਂ ਐਮਰਜੈਂਸੀ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"ਸੰਪਰਕ ਹਟਾਓ"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਸਹੀ ਢੰਗ ਨਾਲ ਪੜ੍ਹਨ ਦੇ ਅਯੋਗ"</string>
@@ -99,11 +99,11 @@
<string name="ok" msgid="163967937451981024">"ਠੀਕ"</string>
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"ਫ਼ੋਨ ਦੇ ਮਾਲਕ ਬਾਰੇ ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"ਜੇਕਰ ਇਹ ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੈ, ਤਾਂ ਉਹ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਪੈਂਸਿਲ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰੋ ਜੋ ਕਿ ਸੰਕਟਕਾਲੀਨ ਸਥਿਤੀ ਵਿੱਚ ਇੱਥੇ ਦਿਖਾਈ ਦੇਵੇਗੀ"</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"ਜੇਕਰ ਇਹ ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੈ, ਤਾਂ ਉਹ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਪੈਂਸਿਲ ਚਿੰਨ੍ਹ \'ਤੇ ਟੈਪ ਕਰੋ ਜੋ ਕਿ ਐਮਰਜੈਂਸੀ ਦੀ ਸਥਿਤੀ ਵਿੱਚ ਇੱਥੇ ਵਿਖਾਈ ਦੇਵੇਗੀ"</string>
<string name="clear_all" msgid="8899013032870561633">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string>
<string name="clear" msgid="3648880442502887163">"ਕਲੀਅਰ ਕਰੋ"</string>
<string name="clear_all_message" msgid="1548432000373861295">"ਕੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਕਟਕਾਲੀਨ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰਨ ਨਾਲ ਕਿਸੇ ਸੰਕਟਕਾਲ ਵਿੱਚ ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਪਹੁੰਚਣ ਵਾਲੇ ਮਦਦਗਾਰਾਂ ਨੂੰ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਿਅਕਤੀ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕੀਤੇ ਬਿਨਾਂ ਤੁਹਾਡੀ ਲਾਕ ਸਕ੍ਰੀਨ ਤੋਂ ਇਹ ਜਾਣਕਾਰੀ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।"</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਕਟਕਾਲੀਨ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰਨ ਨਾਲ ਕਿਸੇ ਸੰਕਟਕਾਲ ਵਿੱਚ ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਪਹੁੰਚਣ ਵਾਲੇ ਮਦਦਗਾਰਾਂ ਨੂੰ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਿਅਕਤੀ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਿਨਾਂ ਤੁਹਾਡੀ ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਇਹ ਜਾਣਕਾਰੀ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।"</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"ਮਹੱਤਵਪੂਰਨ ਜਾਣਕਾਰੀ ਲੱਭਣ ਵਿੱਚ ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਪਹੁੰਚਣ ਵਾਲੇ ਮਦਦਗਾਰਾਂ ਦੀ ਮਦਦ ਕਰੋ"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2bb140a..3133e84 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
<string name="clear" msgid="3648880442502887163">"Limpar"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Limpar todas as informações e contatos?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"Adicionar informações médicas e contatos de emergência pode ajudar os socorristas em uma emergência.\n\nQualquer pessoa pode ler essas informações na tela de bloqueio sem destravar o smartphone."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"A adição de informações médicas e contatos de emergência pode ajudar os socorristas em uma emergência.\n\nQualquer pessoa pode ler essas informações na tela de bloqueio sem destravar o smartphone."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Adicionar informações de emergência"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Ajudar os socorristas a encontrar informações importantes"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 150d07c..cec557f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -104,6 +104,6 @@
<string name="clear" msgid="3648880442502887163">"Vymazať"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Vymazať všetky informácie a kontakty?"</string>
<string name="emergency_info_footer" msgid="4694516011247606250">"Pridaním zdravotníckych informácií a núdzových kontaktov pomôžete prvým zasahujúcim osobám v núdzovej situácii.\n\nTieto informácie si môže na uzamknutej obrazovke prečítať hocikto bez odomknutia vášho telefónu."</string>
- <string name="settings_suggestion_title" msgid="2503369576806243476">"Pridajte tiesňové informácie"</string>
+ <string name="settings_suggestion_title" msgid="2503369576806243476">"Pridajte núdzové informácie"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"Pomôžte prvým zasahujúcim osobám zistiť dôležité informácie"</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 545afe3..f52bd05 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -83,7 +83,7 @@
<string name="organ_donor" msgid="5953509460007124827">"உறுப்பு தானம் செய்பவர்"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"தெரியவில்லை"</string>
<string name="yes" msgid="5829765567799916128">"ஆம்"</string>
- <string name="no" msgid="1681689233660683509">"இல்லை"</string>
+ <string name="no" msgid="1681689233660683509">"வேண்டாம்"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"அனைத்தையும் அழி"</string>
<string name="clear" msgid="3648880442502887163">"அழி"</string>
<string name="clear_all_message" msgid="1548432000373861295">"எல்லா தகவலையும் தொடர்புகளையும் அழிக்கவா?"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"அவசரகாலத்தில் முதலில் வந்து உதவுபவர்களுக்குக் கிடைக்கும்படி உங்கள் உடல்நிலை குறித்த மருத்துவத் தகவலையும் அவசரகாலத் தொடர்புகளையும் சேக்கவும்.\n\nஉங்கள் மொபைலைத் திறக்காமலேயே, பூட்டிய திரையிலிருந்து இந்தத் தகவலை எவரும் பார்க்க முடியும்."</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"மருத்துவத் தகவலையும் அவசரகாலத் தொடர்புகளையும் சேர்த்தால், அவசரகாலத்தில் முதலில் உதவுபவர்களுக்கு உதவலாம்.\n\nஉங்கள் மொபைலைத் திறக்காமலேயே, பூட்டுத் திரையிலிருந்து இந்தத் தகவலை எவரும் பார்க்க முடியும்."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"அவசரத் தகவலைச் சேர்க்கவும்"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"முதலில் உதவுபவர்கள் முக்கியமான தகவலைப் பெற உதவவும்"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c3639b8..406cbd0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
<string name="clear" msgid="3648880442502887163">"清除"</string>
<string name="clear_all_message" msgid="1548432000373861295">"要清除所有信息和联系人吗？"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"添加医疗信息和紧急情况联系人，有助于第一线救援人员在发生紧急事件时提供相关援助。\n\n任何人都无需将您的手机解锁，即可在锁定屏幕上看到此类信息。"</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"添加医疗信息和紧急情况联系人，有助于第一线救援人员在发生紧急事件时提供相关援助。\n\n任何人都能在您的手机未解锁的情况下在锁定屏幕上看到此类信息。"</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"添加紧急信息"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"协助第一线救援人员找到重要信息"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1ddc358..eb93940 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -103,7 +103,7 @@
<string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
<string name="clear" msgid="3648880442502887163">"清除"</string>
<string name="clear_all_message" msgid="1548432000373861295">"要清除所有資訊和聯絡人嗎？"</string>
- <string name="emergency_info_footer" msgid="4694516011247606250">"新增醫療資訊和緊急聯絡人，以便第一線救援人員在發生緊急事件時提供相關協助。\n\n任何人都能在鎖定畫面上查看這項資訊，不必先將手機解鎖。"</string>
+ <string name="emergency_info_footer" msgid="4694516011247606250">"新增醫療資訊和緊急聯絡人，為緊急情況中的第一線處理人員提供協助。\n\n任何人都能在鎖定畫面上查看這項資訊，不必先將手機解鎖。"</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"新增緊急救援資訊"</string>
<string name="settings_suggestion_body" msgid="6623265155762787567">"協助第一線處理人員找到重要資訊"</string>
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a92b598..dd161c5 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -14,6 +14,12 @@
limitations under the License.
-->
<resources>
+ <declare-styleable name="EmergencyEditTextPreference">
+ <!-- Summary text for the text preference. This is used rather than android:summary to
+ avoid indexing the text incorrectly during settings search. -->
+ <attr name="summary" />
+ </declare-styleable>
+
<declare-styleable name="EmergencyListPreference">
<!-- The array to find the content description when an entry from entries is selected.
If a user clicks on the second item in entries, the second item in this array will be
@@ -25,4 +31,4 @@
<attr name="textColorActionBar" format="reference|color" />
</declare-styleable>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9955f28..705a96d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -212,7 +212,7 @@
<!-- Message of dialog shown to clear all information and contacts [CHAR LIMIT=NONE] -->
<string name="clear_all_message">Clear all information and contacts?</string>
<!-- Information footer describing the use of emergency information. [CHAR LIMIT=NONE] -->
- <string name="emergency_info_footer">Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen without unlocking your phone.</string>
+ <string name="emergency_info_footer">Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone.</string>
<!-- Title for a suggestion to a user to set up their emergency information [CHAR_LIMIT=60] -->
<string name="settings_suggestion_title">Add emergency information</string>
<!-- Explanatory text for a suggestion to a user to set up their emergency information [CHAR_LIMIT=NONE] -->
diff --git a/res/xml/edit_medical_info.xml b/res/xml/edit_medical_info.xml
index e1603fc..178cda6 100644
--- a/res/xml/edit_medical_info.xml
+++ b/res/xml/edit_medical_info.xml
@@ -13,22 +13,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
<com.android.emergency.preferences.NameAutoCompletePreference
android:icon="@drawable/ic_account_circle"
android:inputType="textCapWords|textPersonName"
android:key="name"
android:singleLine="true"
- android:summary="@string/unknown_name"
- android:title="@string/name" />
+ android:title="@string/name"
+ app:summary="@string/unknown_name" />
<com.android.emergency.preferences.EmergencyEditTextPreference
android:icon="@drawable/ic_address_black_24dp"
android:inputType="textCapWords|textPostalAddress|textMultiLine"
android:key="address"
android:singleLine="false"
- android:summary="@string/unknown_address"
- android:title="@string/address" />
+ android:title="@string/address"
+ app:summary="@string/unknown_address" />
<com.android.emergency.preferences.EmergencyListPreference
xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
@@ -39,9 +42,9 @@
android:key="blood_type"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
- android:summary="@string/unknown_blood_type"
android:title="@string/blood_type"
- app:entryContentDescriptions="@array/blood_type_content_description" />
+ app:entryContentDescriptions="@array/blood_type_content_description"
+ app:summary="@string/unknown_blood_type" />
<com.android.emergency.preferences.EmergencyEditTextPreference
android:capitalize="sentences"
@@ -51,8 +54,8 @@
android:inputType="textMultiLine"
android:key="allergies"
android:singleLine="false"
- android:summary="@string/unknown_allergies"
- android:title="@string/allergies" />
+ android:title="@string/allergies"
+ app:summary="@string/unknown_allergies" />
<com.android.emergency.preferences.EmergencyEditTextPreference
android:capitalize="sentences"
@@ -62,8 +65,8 @@
android:inputType="textMultiLine"
android:key="medications"
android:singleLine="false"
- android:summary="@string/unknown_medications"
- android:title="@string/medications" />
+ android:title="@string/medications"
+ app:summary="@string/unknown_medications" />
<com.android.emergency.preferences.EmergencyListPreference
android:entries="@array/organ_donor_entries"
@@ -73,8 +76,8 @@
android:defaultValue=""
android:negativeButtonText="@null"
android:positiveButtonText="@null"
- android:summary="@string/unknown_organ_donor"
- android:title="@string/organ_donor" />
+ android:title="@string/organ_donor"
+ app:summary="@string/unknown_organ_donor" />
<com.android.emergency.preferences.EmergencyEditTextPreference
android:capitalize="sentences"
@@ -84,6 +87,6 @@
android:inputType="textMultiLine"
android:key="medical_conditions"
android:singleLine="false"
- android:summary="@string/unknown_medical_conditions"
- android:title="@string/medical_conditions" />
+ android:title="@string/medical_conditions"
+ app:summary="@string/unknown_medical_conditions" />
</PreferenceScreen>
diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index a543ae0..8ef58c4 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -149,7 +149,7 @@
icon = new CircleFramedDrawable(mContact.getPhoto(),
(int) getContext().getResources().getDimension(R.dimen.circle_avatar_size));
} else {
- icon = getContext().getResources().getDrawable(R.drawable.ic_person_black_24dp);
+ icon = getContext().getResources().getDrawable(R.drawable.ic_account_circle);
}
setIcon(icon);
}
diff --git a/src/com/android/emergency/preferences/EmergencyEditTextPreference.java b/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
index efb7adc..1511055 100644
--- a/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
+++ b/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
@@ -16,6 +16,7 @@
package com.android.emergency.preferences;
import android.content.Context;
+import android.content.res.TypedArray;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.TextUtils;
@@ -23,6 +24,7 @@
import android.view.View;
import android.widget.TextView;
+import com.android.emergency.R;
import com.android.emergency.ReloadablePreferenceInterface;
import com.android.settingslib.CustomEditTextPreference;
@@ -36,6 +38,12 @@
public EmergencyEditTextPreference(Context context, AttributeSet attrs) {
super(context, attrs);
+ TypedArray a = context.obtainStyledAttributes(
+ attrs, R.styleable.EmergencyEditTextPreference, 0, 0);
+ if (a.hasValue(R.styleable.EmergencyEditTextPreference_summary)) {
+ setSummary(a.getString(R.styleable.EmergencyEditTextPreference_summary));
+ }
+ a.recycle();
}
@Override