Merge "Make the color of the status bar light." into oc-dev am: ceae2f3762
am: 2bb0776b9d
Change-Id: I90fe6405fdef6d69e7caa2b72465b783f73ccf80
diff --git a/Android.mk b/Android.mk
index 275213d..adb0ec1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,8 @@
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.emergency.*
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c8a25b..14d589a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,11 +47,21 @@
android:taskAffinity="com.android.settings"
android:launchMode="singleTask">
<intent-filter>
- <action android:name="android.settings.EDIT_EMERGENGY_INFO" />
+ <action android:name="android.settings.EDIT_EMERGENCY_INFO" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ </activity>
+
+ <activity
+ android:name=".edit.EditMedicalInfoActivity"
+ android:icon="@mipmap/ic_launcher_settings"
+ android:label="@string/medical_info_title"
+ android:parentActivityName="com.android.emergency.edit.EditInfoActivity"
+ android:theme="@style/AppTheme"
+ android:taskAffinity="com.android.settings"
+ android:launchMode="singleTask">
<intent-filter>
- <action android:name="android.emergency.EDIT_EMERGENCY_CONTACTS" />
+ <action android:name="android.emergency.EDIT_MEDICAL_INFO" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
diff --git a/proguard.flags b/proguard.flags
new file mode 100644
index 0000000..2d44933
--- /dev/null
+++ b/proguard.flags
@@ -0,0 +1,5 @@
+# Keep annotated classes or class members.
+-keep @android.support.annotation.Keep class *
+-keepclassmembers class * {
+ @android.support.annotation.Keep *;
+}
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index bae9f9c..2c92dae 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="#4285F4"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>
diff --git a/res/drawable/ic_mode_edit_googblue_24dp.xml b/res/drawable/ic_mode_edit_googblue_24dp.xml
new file mode 100644
index 0000000..5a78166
--- /dev/null
+++ b/res/drawable/ic_mode_edit_googblue_24dp.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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 android:autoMirrored="true" android:height="24dp"
+ android:viewportHeight="24.0" android:viewportWidth="24.0"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#4285F4" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b7264b5..0ffe499 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -17,6 +17,8 @@
<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">"Noodinligting"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Mediese inligting"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Wysig inligting"</string>
<string name="edit_info" msgid="5973929805855224805">"Wysig noodinligting"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Inligting"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakte"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Kanselleer"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Noodinligting"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Inligting wat jy hier invoer, kan dié help wat in \'n noodgeval eerste reageer. Dit word net op jou toestel geberg en enigiemand kan dit van die noodbeller af lees sonder om jou foon te ontsluit."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Gaan voort"</string>
<string name="no_info_provided" msgid="716200382010821001">"Geen inligting oor die foon se eienaar nie"</string>
<string name="tap_pencil" msgid="2723698054265296934">"As dit jou foon is, tik op die potloodikoon om inligting by te voeg wat in geval van nood hier gewys sal word"</string>
<string name="clear_all" msgid="8899013032870561633">"Vee alles uit"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 05bbba0..2f8ef98 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"መረጃ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"እውቂያዎች"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"ይቅር"</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="user_emergency_info_title" msgid="7827058167207376581">"የአስቸኳይ አደጋ ጊዜ መረጃ"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"እዚህ የሚያስገቡት መረጃ በአስቸኳይ አደጋ ላይ ለሚመጡ የመጀመሪያ እርዳታ ሰጪዎች ሊረዳቸው ይችላል። በእርስዎ መሣሪያ ላይ ብቻ ነው የሚከማቸው፣ ነገር ግን ማንኛውም ሰው ስልክዎን መክፈት ሳያስፈልገው ከድንገተኛ መደወያው ላይ ሊያነብበው ይችላል።"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ቀጥል"</string>
<string name="no_info_provided" msgid="716200382010821001">"ስለስልኩ ባለቤት ምንም መረጃ የለም"</string>
<string name="tap_pencil" msgid="2723698054265296934">"ይሄ የእርስዎ ስልክ ከሆነ በአስቸኳይ አደጋ ጊዜ እዚህ ላይ የሚታየውን መረጃ ለማከል የእርሳስ አዶውን መታ ያድርጉት"</string>
<string name="clear_all" msgid="8899013032870561633">"ሁሉንም አጽዳ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f219a1d..234dbba 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"المعلومات"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"جهات الاتصال"</string>
@@ -29,7 +31,7 @@
<string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
<string name="age" msgid="8327537794752630199">"العمر: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
<string name="remove_dob_icon_text" msgid="4413507180967999944">"إزالة تاريخ الميلاد"</string>
- <string name="blood_type" msgid="6947022772999974608">"فصيلة الدم"</string>
+ <string name="blood_type" msgid="6947022772999974608">"فئة الدم"</string>
<string name="unknown_blood_type" msgid="6337228278125085668">"غير معروفة"</string>
<string name="oplus" msgid="7759756742377867011">"O+"</string>
<string name="ominus" msgid="5227278501191741055">"O-"</string>
@@ -69,7 +71,7 @@
<string name="ab_positive" msgid="1931300033534642005">"A B موجب"</string>
<string name="ab_negative" msgid="2064555613093591729">"A B سالب"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
- <string name="allergies" msgid="2789200777539258165">"أمراض الحساسية"</string>
+ <string name="allergies" msgid="2789200777539258165">"حساسية"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"غير معروفة"</string>
<string name="allergies_hint" msgid="5488918780522184147">"الفول السوداني مثلاً"</string>
<string name="medications" msgid="644428945685557183">"الأدوية"</string>
@@ -78,7 +80,7 @@
<string name="medical_conditions" msgid="3555690011498283592">"ملاحظات طبية"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"غير معروفة"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"الربو مثلاً"</string>
- <string name="organ_donor" msgid="5953509460007124827">"المتبرِّع بالعضو"</string>
+ <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>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"إلغاء"</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="user_emergency_info_title" msgid="7827058167207376581">"معلومات الطوارئ"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"يمكن أن تساعد المعلومات التي تدخلها هنا أول المستجيبين في حالات الطوارئ. ويتم تخزين هذه المعلومات على جهازك فقط، ويمكن لأي شخص أن يقرأها من برنامج الاتصال بالطوارئ بدون إلغاء قفل هاتفك."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"متابعة"</string>
<string name="no_info_provided" msgid="716200382010821001">"لا تتوفر معلومات حول مالك الهاتف"</string>
<string name="tap_pencil" msgid="2723698054265296934">"إذا كان هذا هاتفك، فانقر على رمز القلم لإضافة معلومات يتم عرضها هنا في حالة الطوارئ."</string>
<string name="clear_all" msgid="8899013032870561633">"مسح الكل"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 4a25246..c41e7c5 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -17,6 +17,8 @@
<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">"Təcili məlumat"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Tibbi məlumat"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Məlumata düzəliş edin"</string>
<string name="edit_info" msgid="5973929805855224805">"Təcili məlumatı redaktə edin"</string>
<string name="tab_title_info" msgid="1402033103294855812">"İnfo"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktlar"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Ləğv edin"</string>
<string name="ok" msgid="163967937451981024">"Ok"</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="user_emergency_info_title" msgid="7827058167207376581">"Təcili məlumat"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Daxil etdiyiniz məlumat təcili durumda ilk cavab verənlərə yardım edə bilər. Bu yalnız cihazınızda yadda saxlanılıb və hər kəs bunu telefon kilidini açmadan təcili nömrə yığımında oxuya bilər."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Davam edin"</string>
<string name="no_info_provided" msgid="716200382010821001">"Telefon sahibi haqqında heç bir məlumat yoxdur"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Əgər bu Sizin telefonunuzdursa, fövqəladə hal zamanı burada görünəcək məlumatı əlavə etmək üçün karandaş ikonasına tıklayın"</string>
<string name="clear_all" msgid="8899013032870561633">"Hamısını silin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 973b034..28f8ad3 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -17,6 +17,8 @@
<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">"Informacije za hitne slučajeve"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medicinski podaci"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Izmeni podatke"</string>
<string name="edit_info" msgid="5973929805855224805">"Izmenite informacije za hitne slučajeve"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakti"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Otkaži"</string>
<string name="ok" msgid="163967937451981024">"Potvrdi"</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="user_emergency_info_title" msgid="7827058167207376581">"Informacije za hitne slučajeve"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informacije koje ovde unesete mogu da pomognu ekipama hitnih službi u hitnim slučajevima. Čuvaju se samo na uređaju i svako može da ih pročita iz aplikacije za pozive u hitnim slučajevima bez otključavanja telefona."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Nastavi"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nema informacija o vlasniku telefona"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ako je ovo vaš telefon, dodirnite ikonu olovke da biste dodali informacije koje će se prikazivati ovde u hitnom slučaju"</string>
<string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 65de12f..b799c2b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -16,7 +16,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="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="tab_title_info" msgid="1402033103294855812">"Звесткі"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Кантакты"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Скасаваць"</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="user_emergency_info_title" msgid="7827058167207376581">"Звесткі для экстранных сітуац."</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Інфармацыя, якую вы ўведзяце тут, можа быць карыснай для асоб, якія будуць аказваць першую дапамогу ў выпадку надзвычайнай сітуацыі. Яна захоўваецца толькі на вашай прыладзе, і любы чалавек можа прачытаць яе ў набіральніку нумара для экстранных сітуацый, не разблакіроўваючы тэлефон."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Працягнуць"</string>
<string name="no_info_provided" msgid="716200382010821001">"Няма інфармацыі аб уладальніку тэлефона"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Калі гэта ваш тэлефон, дакраніцеся да значка алоўка, каб дадаць інфармацыю, якая будзе адлюстроўвацца тут у выпадку ўзнікнення надзвычайнай сітуацыі"</string>
<string name="clear_all" msgid="8899013032870561633">"Ачысціць усё"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8791e7e..aa7a78f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Информация"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контакти"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Отказ"</string>
<string name="ok" msgid="163967937451981024">"ОK"</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="user_emergency_info_title" msgid="7827058167207376581">"Информация за спешни случаи"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Информацията, която въведете тук, може да помогне на органите за бързо реагиране при спешен случай. Тези данни се съхраняват само на устройството ви и всеки ще е в състояние да ги прочете от клавиатурата за набиране на спешни номера, без да отключва телефона ви."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Напред"</string>
<string name="no_info_provided" msgid="716200382010821001">"Няма информация за собственика на телефона"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ако това е вашият телефон, докоснете иконата на молив, за да добавите информация, която ще се показва тук при спешни случаи"</string>
<string name="clear_all" msgid="8899013032870561633">"Изчиств. на вс."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 46fbf91..3f101ea 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"তথ্য"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"পরিচিতিগুলি"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"বাতিল করুন"</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="user_emergency_info_title" msgid="7827058167207376581">"জরুরি তথ্য"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"এখানে আপনার লেখা তথ্য জরুরী অবস্থায় প্রথম উত্তরদাতাকে সহায়তা করতে পারে৷ এটি শুধুমাত্র আপনার ডিভাইসে সঞ্চিত হয়, এবং যে কেউ আপনার ফোনটিকে আনলক না করেই জরুরী ডায়ালার থেকে এটিকে পড়তে পারবেন৷"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"অবিরত রাখুন"</string>
<string name="no_info_provided" msgid="716200382010821001">"ফোনের মালিকের সম্পর্কে কোন তথ্য নেই"</string>
<string name="tap_pencil" msgid="2723698054265296934">"যদি এটি আপনার ফোন হয় তাহলে তথ্য যোগ করতে পেন্সিল আইকনে আলতো চাপুন যা জরুরী ক্ষেত্রে এখানে প্রদর্শিত হবে"</string>
<string name="clear_all" msgid="8899013032870561633">"সবকিছু সাফ করুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 8ca81a9..54c7efb 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -17,6 +17,8 @@
<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">"Informacije za hitne slučajeve"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Zdravstveni podaci"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Uređivanje informacija"</string>
<string name="edit_info" msgid="5973929805855224805">"Izmijeni informacije za hitne slučajeve"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakti"</string>
@@ -75,7 +77,7 @@
<string name="medications" msgid="644428945685557183">"Lijekovi"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Nepoznato"</string>
<string name="medications_hint" msgid="3221620025945593723">"Naprimjer, aspirin"</string>
- <string name="medical_conditions" msgid="3555690011498283592">"Zdravstveni karton"</string>
+ <string name="medical_conditions" msgid="3555690011498283592">"Medicinske napomene"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Nepoznato"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Naprimjer, astma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Donator organa"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Otkaži"</string>
<string name="ok" msgid="163967937451981024">"Uredu"</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="user_emergency_info_title" msgid="7827058167207376581">"Informacije za hitne slučajeve"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informacije koje ovdje unesete mogu pomoći osobama koje prve reagiraju u hitnom slučaju. Pohranjene su samo na vašem uređaju, ali ih svako može pročitati sa brojčane tastature za hitne slučajave, bez otključavanja telefona."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Nastavi"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nema informacija o vlasniku telefona"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ako je ovo vaš telefon, dodirnite ikonu olovke da dodate informacije koje će se ovdje prikazati u hitnom slučaju"</string>
<string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c82b0c5..f4efa78 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -17,6 +17,8 @@
<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ó d\'emergència"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informació mèdica"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edita la informació"</string>
<string name="edit_info" msgid="5973929805855224805">"Edita la informació d\'emergència"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informació"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contactes"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Cancel·la"</string>
<string name="ok" msgid="163967937451981024">"D\'acord"</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="user_emergency_info_title" msgid="7827058167207376581">"Informació d\'emergència"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"La informació que introdueixis aquí pot ser útil per als serveis d\'emergència. Aquesta informació només es desa al dispositiu, i tothom pot consultar-la al marcador d\'emergència sense desbloquejar el telèfon."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continua"</string>
<string name="no_info_provided" msgid="716200382010821001">"No hi ha informació sobre el propietari del telèfon"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Si el telèfon és teu, toca la icona de llapis per afegir la informació que es mostrarà aquí en cas d\'emergència"</string>
<string name="clear_all" msgid="8899013032870561633">"Esborra-ho tot"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 165c68a..ae05e47 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,6 +17,8 @@
<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">"Nouzové informace"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Zdravotní údaje"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Upravit údaje"</string>
<string name="edit_info" msgid="5973929805855224805">"Upravit nouzové informace"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informace"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakty"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Zrušit"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Nouzové informace"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Uvedené informace jsou určeny osobám, které se k telefonu dostanou v nouzové situaci. Jsou uloženy v zařízení a zobrazují se na obrazovce tísňového volání bez nutnosti odemykat telefon."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Pokračovat"</string>
<string name="no_info_provided" msgid="716200382010821001">"Žádné informace o vlastníkovi telefonu"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Pokud je to váš telefon, klepněte na ikonu tužky a zadejte údaje, které se zde zobrazí v případě nouze"</string>
<string name="clear_all" msgid="8899013032870561633">"Vymazat vše"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bb40019..5df9529 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,9 +16,11 @@
<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">"Oplysninger i nødsituationer"</string>
- <string name="edit_info" msgid="5973929805855224805">"Rediger oplysninger i nødsituationer"</string>
- <string name="tab_title_info" msgid="1402033103294855812">"Oplysninger"</string>
+ <string name="app_label" msgid="1090682794607161063">"Info til nødsituationer"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Helbredsoplysninger"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Rediger oplysninger"</string>
+ <string name="edit_info" msgid="5973929805855224805">"Rediger info til nødsituationer"</string>
+ <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktpersoner"</string>
<string name="name" msgid="4286267457738861977">"Navn"</string>
<string name="unknown_name" msgid="2834802479170495056">"Ukendt"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"Annuller"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Oplysninger i nødsituationer"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"De oplysninger, du angiver her, kan hjælpe førstehjælpsydere i en nødsituation. De gemmes kun på din enhed, og alle kan se dem via funktionen Nødopkald på låseskærmen uden at låse din telefon op."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Fortsæt"</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 oplysninger, som vises her i nødsituationer"</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 alle"</string>
<string name="clear" msgid="3648880442502887163">"Ryd"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontaktpersoner?"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5de6d0f..1de9247 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -17,6 +17,8 @@
<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">"Notfallinformationen"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medizinische Informationen"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Informationen bearbeiten"</string>
<string name="edit_info" msgid="5973929805855224805">"Notfallinformationen bearbeiten"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakte"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Abbrechen"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Notfallinformationen"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Hier eingegebene Informationen können Ersthelfer in einer Notsituation unterstützen. Die Informationen werden nur auf deinem Gerät gespeichert und sind für alle über den Notruf einsehbar, ohne dass dein Telefon entsperrt werden muss."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Weiter"</string>
<string name="no_info_provided" msgid="716200382010821001">"Keine Informationen über den Eigentümer des Smartphones verfügbar"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Wenn du der Eigentümer dieses Smartphones bist, tippe auf das Bleistiftsymbol, um Informationen hinzuzufügen, die im Notfall eingeblendet werden"</string>
<string name="clear_all" msgid="8899013032870561633">"Alle löschen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 51c0be8..b6201f6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Πληροφορίες"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Επαφές"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Ακύρωση"</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="user_emergency_info_title" msgid="7827058167207376581">"Πληροφορίες έκτακτης ανάγκης"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Οι πληροφορίες που εισάγετε εδώ μπορούν να βοηθήσουν τα άτομα που θα ανταποκριθούν πρώτα σε περίπτωση έκτακτης ανάγκης. Αποθηκεύονται μόνο στη συσκευή σας και μπορούν να τα διαβάσουν όλοι από το πρόγραμμα κλήσης έκτακτης ανάγκης χωρίς να ξεκλειδώσουν το τηλέφωνό σας."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Συνέχεια"</string>
<string name="no_info_provided" msgid="716200382010821001">"Δεν υπάρχουν πληροφορίες σχετικά με τον κάτοχο του τηλεφώνου"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Εάν αυτό είναι το τηλέφωνό σας, πατήστε στο εικονίδιο με το μολύβι για να προσθέσετε πληροφορίες οι οποίες θα εμφανιστούν εδώ σε περίπτωση έκτακτης ανάγκης"</string>
<string name="clear_all" msgid="8899013032870561633">"Διαγραφή όλων"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 00afe62..f17a86f 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -17,6 +17,8 @@
<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">"Emergency information"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medical information"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edit information"</string>
<string name="edit_info" msgid="5973929805855224805">"Edit emergency information"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Cancel"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Emergency information"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Information that you enter here can help the first-response team in an emergency. It is stored on your device only and anyone can read it from the emergency dialler without unlocking your phone."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continue"</string>
<string name="no_info_provided" msgid="716200382010821001">"No information about the phone\'s owner"</string>
<string name="tap_pencil" msgid="2723698054265296934">"If this is your phone, tap the pencil icon to add information that will be displayed here in case of emergency"</string>
<string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 00afe62..f17a86f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -17,6 +17,8 @@
<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">"Emergency information"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medical information"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edit information"</string>
<string name="edit_info" msgid="5973929805855224805">"Edit emergency information"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Cancel"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Emergency information"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Information that you enter here can help the first-response team in an emergency. It is stored on your device only and anyone can read it from the emergency dialler without unlocking your phone."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continue"</string>
<string name="no_info_provided" msgid="716200382010821001">"No information about the phone\'s owner"</string>
<string name="tap_pencil" msgid="2723698054265296934">"If this is your phone, tap the pencil icon to add information that will be displayed here in case of emergency"</string>
<string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 00afe62..f17a86f 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -17,6 +17,8 @@
<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">"Emergency information"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medical information"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edit information"</string>
<string name="edit_info" msgid="5973929805855224805">"Edit emergency information"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Cancel"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Emergency information"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Information that you enter here can help the first-response team in an emergency. It is stored on your device only and anyone can read it from the emergency dialler without unlocking your phone."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continue"</string>
<string name="no_info_provided" msgid="716200382010821001">"No information about the phone\'s owner"</string>
<string name="tap_pencil" msgid="2723698054265296934">"If this is your phone, tap the pencil icon to add information that will be displayed here in case of emergency"</string>
<string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5c98949..d3195fd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,6 +17,8 @@
<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 emergencia"</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 emergencia"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
@@ -29,7 +31,7 @@
<string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
<string name="age" msgid="8327537794752630199">"Edad: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
<string name="remove_dob_icon_text" msgid="4413507180967999944">"Quitar la fecha de nacimiento"</string>
- <string name="blood_type" msgid="6947022772999974608">"Tipo de sangre"</string>
+ <string name="blood_type" msgid="6947022772999974608">"Grupo sanguíneo"</string>
<string name="unknown_blood_type" msgid="6337228278125085668">"Desconocido"</string>
<string name="oplus" msgid="7759756742377867011">"O+"</string>
<string name="ominus" msgid="5227278501191741055">"O-"</string>
@@ -70,14 +72,14 @@
<string name="ab_negative" msgid="2064555613093591729">"AB negativo"</string>
<string name="h_h" msgid="2183333409760379720">"HH"</string>
<string name="allergies" msgid="2789200777539258165">"Alergias"</string>
- <string name="unknown_allergies" msgid="4383115953418061237">"Desconocida"</string>
- <string name="allergies_hint" msgid="5488918780522184147">"Por ejemplo, maní"</string>
+ <string name="unknown_allergies" msgid="4383115953418061237">"Desconocidas"</string>
+ <string name="allergies_hint" msgid="5488918780522184147">"Por ejemplo, a las nueces"</string>
<string name="medications" msgid="644428945685557183">"Medicamentos"</string>
- <string name="unknown_medications" msgid="2764171064510423734">"Desconocido"</string>
- <string name="medications_hint" msgid="3221620025945593723">"Por ejemplo, aspirina"</string>
+ <string name="unknown_medications" msgid="2764171064510423734">"Desconocidos"</string>
+ <string name="medications_hint" msgid="3221620025945593723">"Por ejemplo, a la penicilina"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Notas médicas"</string>
- <string name="unknown_medical_conditions" msgid="8051364895172053770">"Desconocida"</string>
- <string name="medical_conditions_hint" msgid="6959152183029062882">"Por ejemplo, asma"</string>
+ <string name="unknown_medical_conditions" msgid="8051364895172053770">"Desconocidas"</string>
+ <string name="medical_conditions_hint" msgid="6959152183029062882">"Por ejemplo, tengo asma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Donante de órganos"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"Desconocido"</string>
<string name="yes" msgid="5829765567799916128">"Sí"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"Cancelar"</string>
<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="user_emergency_info_title" msgid="7827058167207376581">"Información de emergencia"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"La información que ingreses aquí puede ayudar a los rescatistas en caso de emergencia. Se almacena solo en tu dispositivo, y cualquiera puede leerla desde el marcador de emergencia sin necesidad de desbloquear el teléfono."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuar"</string>
<string name="no_info_provided" msgid="716200382010821001">"No hay información sobre el propietario del teléfono"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"Si este teléfono es tuyo, presiona el ícono el lápiz para agregar información que se mostrará aquí en caso de emergencia"</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"Si este teléfono es tuyo, presiona el ícono del lápiz para agregar información que se mostrará aquí en caso de emergencia"</string>
<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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5dc40c9..d263548 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,6 +17,8 @@
<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 emergencia"</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">"Cambiar información de emergencia"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
@@ -96,12 +98,9 @@
<string name="cancel" msgid="7401575239009060939">"Cancelar"</string>
<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="user_emergency_info_title" msgid="7827058167207376581">"Información de emergencia"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"La información que introduzcas aquí puede ser útil para los servicios de emergencia. Esta información solo se almacena en tu dispositivo, y cualquiera puede consultarla desde el marcador de emergencia sin desbloquear el teléfono."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuar"</string>
<string name="no_info_provided" msgid="716200382010821001">"No hay información sobre el propietario del teléfono"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"Si eres el propietario de este teléfono, toca el icono de lápiz para añadir información que se mostrará en caso de emergencia"</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"Si eres el propietario de este teléfono, toca el icono de lápiz para añadir información que mostrar en caso de emergencia"</string>
<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 todos los contactos?"</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"¿Borrar toda la información y los contactos?"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f4f0198..8288793 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -17,6 +17,8 @@
<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">"Hädaabiteave"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Meditsiiniline teave"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Teabe muutmine"</string>
<string name="edit_info" msgid="5973929805855224805">"Hädaabiteabe muutmine"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Teave"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktid"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Tühista"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Hädaabiteave"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Siin sisestatud teave aitab hädaolukorras esimesena reageerinuid. See salvestatakse ainult teie seadmesse ja kõik saavad seda teie telefoni avamata hädaabikõne helistamisprogrammis lugeda."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Jätka"</string>
<string name="no_info_provided" msgid="716200382010821001">"Telefoni omaniku kohta pole teavet"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Kui see on teie telefon, puudutage pliiatsiikooni, et lisada teave, mis siin hädaolukorras kuvatakse"</string>
<string name="clear_all" msgid="8899013032870561633">"Kustuta kõik"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index b703192..b9d41fa 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -17,6 +17,8 @@
<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">"Larrialdietarako informazioa"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Mediku-informazioa"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Editatu informazioa"</string>
<string name="edit_info" msgid="5973929805855224805">"Editatu larrialdietarako informazioa"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informazioa"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktuak"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Utzi"</string>
<string name="ok" msgid="163967937451981024">"Ados"</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="user_emergency_info_title" msgid="7827058167207376581">"Larrialdietarako informazioa"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Hemen idatzitako informazioa larrialdiei erantzuten dieten lehenengo pertsonentzat da baliagarria. Gailuan soilik gordetzen da eta larrialdi-markagailutik irakur daiteke telefonoa desblokeatu gabe."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Jarraitu"</string>
<string name="no_info_provided" msgid="716200382010821001">"Ez dago telefonoaren jabeari buruzko informaziorik"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Zurea bada telefonoa, sakatu arkatzaren ikonoa eta gehitu informazioa, larrialdi-kasuetan hemen bistara dadin"</string>
<string name="clear_all" msgid="8899013032870561633">"Garbitu guztiak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 72eb08d..b25fec8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"اطلاعات"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"تماسهای اضطراری"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"لغو"</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="user_emergency_info_title" msgid="7827058167207376581">"اطلاعات اضطراری"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"اطلاعاتی که اینجا وارد میکنید میتواند در شرایط اضطراری به اولین افرادی که در صحنه حاضر میشوند راهنمایی کند. این اطلاعات فقط در دستگاهتان ذخیره میشود، و همه میتوانند بدون باز کردن قفل دستگاهتان، آن را از شمارهگیر اضطراری بخوانند."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ادامه"</string>
<string name="no_info_provided" msgid="716200382010821001">"اطلاعاتی درباره مالک تلفن وجود ندارد"</string>
<string name="tap_pencil" msgid="2723698054265296934">"اگر این تلفن شما است، برای اضافه کردن اطلاعاتی که در موارد اضطراری اینجا نشان داده خواهد شد، روی نماد مداد ضربه بزنید"</string>
<string name="clear_all" msgid="8899013032870561633">"پاک کردن همه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c7c4cd8..bc68dd4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,6 +17,8 @@
<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">"Hätätilannetiedot"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Lääketieteelliset tiedot"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Muokkaa tietoja"</string>
<string name="edit_info" msgid="5973929805855224805">"Muokkaa hätätilannetietoja"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Tiedot"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Yhteystiedot"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Peruuta"</string>
<string name="ok" msgid="163967937451981024">"Ok"</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="user_emergency_info_title" msgid="7827058167207376581">"Hätätilannetiedot"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Tässä antamasi tiedot voivat auttaa ensiavun antajia hätätilanteessa. Tiedot tallennetaan vain laitteellesi, mutta kuka tahansa voi lukea ne hätäpuhelunäytöltä avaamatta puhelimen lukitusta."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Jatka"</string>
<string name="no_info_provided" msgid="716200382010821001">"Ei tietoja puhelimen omistajasta"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Jos tämä on sinun puhelimesi, kosketa kynäkuvaketta ja anna tietoja, jotka näytetään hätätilanteessa tässä näytössä."</string>
<string name="clear_all" msgid="8899013032870561633">"Tyhjennä kaikki"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0924a25..d252975 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -17,6 +17,8 @@
<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">"Données d\'urgence"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Données médicales"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Modifier les données"</string>
<string name="edit_info" msgid="5973929805855224805">"Modifier les données d\'urgence"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Information"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Annuler"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Données d\'urgence"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Les données que vous entrez ici peuvent aider les premiers intervenants en cas d\'urgence. Elles sont stockées sur votre appareil seulement, et tout le monde peut y accéder à partir du composeur d\'urgence sans devoir déverrouiller votre téléphone."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuer"</string>
<string name="no_info_provided" msgid="716200382010821001">"Aucun renseignement sur le propriétaire du téléphone"</string>
<string name="tap_pencil" msgid="2723698054265296934">"S\'il s\'agit de votre téléphone, touchez l\'icône représentant un crayon pour ajouter des renseignements qui seront affichés ici en cas d\'urgence."</string>
<string name="clear_all" msgid="8899013032870561633">"Effacer tout"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 659e00a..5c8322c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,6 +17,8 @@
<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">"Informations d\'urgence"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informations médicales"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Modifier les informations"</string>
<string name="edit_info" msgid="5973929805855224805">"Modifier les informations d\'urgence"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informations"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -79,7 +81,7 @@
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Inconnues"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Par exemple, asthme"</string>
<string name="organ_donor" msgid="5953509460007124827">"Donneur d\'organes"</string>
- <string name="unknown_organ_donor" msgid="2780515342875494225">"Inconnu"</string>
+ <string name="unknown_organ_donor" msgid="2780515342875494225">"Non précisé"</string>
<string name="yes" msgid="5829765567799916128">"Oui"</string>
<string name="no" msgid="1681689233660683509">"Non"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Annuler"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Informations d\'urgence"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Les informations que vous saisissez ici peuvent aider les premières personnes qui vous porteraient secours en cas d\'urgence. Elles ne sont stockées que sur votre appareil et elles sont accessibles à tous depuis le clavier d\'urgence, sans déverrouiller votre téléphone."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuer"</string>
<string name="no_info_provided" msgid="716200382010821001">"Aucune information sur le propriétaire du téléphone"</string>
<string name="tap_pencil" msgid="2723698054265296934">"S\'il s\'agit de votre téléphone, appuyez sur l\'icône représentant un crayon pour ajouter des informations qui seront affichées ici en cas d\'urgence."</string>
<string name="clear_all" msgid="8899013032870561633">"Tout effacer"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1d328fd..1546246 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -17,20 +17,22 @@
<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 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 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>
- <string name="unknown_name" msgid="2834802479170495056">"Descoñecido"</string>
+ <string name="unknown_name" msgid="2834802479170495056">"Sen indicar"</string>
<string name="address" msgid="6449303483151189969">"Enderezo"</string>
- <string name="unknown_address" msgid="4212576729941786121">"Descoñecido"</string>
+ <string name="unknown_address" msgid="4212576729941786121">"Sen indicar"</string>
<string name="date_of_birth" msgid="777979232444227891">"Data de nacemento"</string>
- <string name="unknown_date_of_birth" msgid="7416355536916066758">"Descoñecida"</string>
+ <string name="unknown_date_of_birth" msgid="7416355536916066758">"Sen indicar"</string>
<string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
<string name="age" msgid="8327537794752630199">"Idade: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
<string name="remove_dob_icon_text" msgid="4413507180967999944">"Elimina a data de nacemento"</string>
<string name="blood_type" msgid="6947022772999974608">"Grupo sanguíneo"</string>
- <string name="unknown_blood_type" msgid="6337228278125085668">"Descoñecido"</string>
+ <string name="unknown_blood_type" msgid="6337228278125085668">"Sen indicar"</string>
<string name="oplus" msgid="7759756742377867011">"O+"</string>
<string name="ominus" msgid="5227278501191741055">"O-"</string>
<string name="aplus" msgid="4982472245421753463">"A+"</string>
@@ -70,16 +72,16 @@
<string name="ab_negative" msgid="2064555613093591729">"A B negativo"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
<string name="allergies" msgid="2789200777539258165">"Alerxias"</string>
- <string name="unknown_allergies" msgid="4383115953418061237">"Descoñecidas"</string>
+ <string name="unknown_allergies" msgid="4383115953418061237">"Sen indicar"</string>
<string name="allergies_hint" msgid="5488918780522184147">"Por exemplo, cacahuetes"</string>
<string name="medications" msgid="644428945685557183">"Medicamentos"</string>
- <string name="unknown_medications" msgid="2764171064510423734">"Descoñecidos"</string>
+ <string name="unknown_medications" msgid="2764171064510423734">"Sen indicar"</string>
<string name="medications_hint" msgid="3221620025945593723">"Por exemplo, aspirina"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Notas médicas"</string>
- <string name="unknown_medical_conditions" msgid="8051364895172053770">"Descoñecidas"</string>
+ <string name="unknown_medical_conditions" msgid="8051364895172053770">"Sen indicar"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Por exemplo, asma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Doante de órganos"</string>
- <string name="unknown_organ_donor" msgid="2780515342875494225">"Descoñecido"</string>
+ <string name="unknown_organ_donor" msgid="2780515342875494225">"Sen indicar"</string>
<string name="yes" msgid="5829765567799916128">"Si"</string>
<string name="no" msgid="1681689233660683509">"Non"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"Cancelar"</string>
<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="user_emergency_info_title" msgid="7827058167207376581">"Información de emerxencia"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"A información que introduciches pode axudar aos servizos de primeira resposta en caso de emerxencia. Só se almacena no teu dispositivo, pero calquera persoa pode lela desde o marcador de emerxencia sen desbloquear o teu teléfono."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuar"</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 mostrara aquí en caso de emerxencia"</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>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6fabe7d..ce5b197 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"માહિતી"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"સંપર્કો"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"રદ કરો"</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="user_emergency_info_title" msgid="7827058167207376581">"કટોકટીની માહિતી"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"તમે અહીં દાખલ કરો છો તે માહિતી કટોકટીમાં પ્રથમ જવાબ આપનારા વપરાશકર્તાઓની સહાય કરી શકે છે. તે તમારા ઉપકરણ પર જ સંગ્રહિત કરવામાં આવે છે અને કોઈપણ વ્યક્તિ તમારા ફોનને અનલૉક કર્યા વિના કટોકટી ડાયલરમાંથી તેને વાંચી શકે છે."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ચાલુ રાખો"</string>
<string name="no_info_provided" msgid="716200382010821001">"ફોનના માલિક વિશે કોઈ માહિતી નથી"</string>
<string name="tap_pencil" msgid="2723698054265296934">"જો આ તમારો ફોન છે, તો તે માહિતી ઉમેરવા માટે પેન્સિલ આઇકનને ટૅપ કરો કે જે કટોકટીની સ્થિતિમાં અહીં પ્રદર્શિત કરવામાં આવશે"</string>
<string name="clear_all" msgid="8899013032870561633">"બધું સાફ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a599970..641c11e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"संपर्क"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"रद्द करें"</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="user_emergency_info_title" msgid="7827058167207376581">"आपातकालीन जानकारी"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"आप यहां जो जानकारी डालते हैं वह आपातकाल में सबसे पहले प्रतिसाद देने वाले लोगों की सहायता कर सकती है. उसे केवल आपके डिवाइस पर संग्रहित किया जाता है और कोई भी व्यक्ति आपके फ़ोन को अनलॉक किए बिना उसे आपातकालीन डायलर से पढ़ सकता है."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"जारी रखें"</string>
<string name="no_info_provided" msgid="716200382010821001">"फ़ोन के स्वामी के बारे में कोई जानकारी नहीं है"</string>
<string name="tap_pencil" msgid="2723698054265296934">"यदि यह आपका फ़ोन है, तो आपात स्थिति में यहां दिखाई जाने वाली जानकारी जोड़ने के लिए पेंसिल आइकन टैप करें"</string>
<string name="clear_all" msgid="8899013032870561633">"सभी साफ़ करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5541f19..4faf8bf 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,6 +17,8 @@
<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">"Podaci za hitne slučajeve"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medicinske informacije"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Uredite informacije"</string>
<string name="edit_info" msgid="5973929805855224805">"Uređivanje podataka za hitne slučajeve"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakti"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Odustani"</string>
<string name="ok" msgid="163967937451981024">"U REDU"</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="user_emergency_info_title" msgid="7827058167207376581">"Podaci za hitne slučajeve"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informacije koje unesete ovdje mogu pomoći službama koje prve reagiraju u hitnim slučajevima. Pohranjuju se samo na vašem uređaju, a na brojčaniku za hitne slučajeve može ih pročitati bilo tko bez otključavanja telefona."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Nastavi"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nema informacija o vlasniku telefona"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ako je ovo vaš telefon, dodirnite ikonu olovke da biste dodali informacije koje će se prikazivati ovdje za hitne slučajeve"</string>
<string name="clear_all" msgid="8899013032870561633">"Izbriši sve"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 300a6a7..42c639b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -17,6 +17,8 @@
<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">"Segélyhívási információk"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Egészségügyi adatok"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Adatok szerkesztése"</string>
<string name="edit_info" msgid="5973929805855224805">"Segélyhívási információk szerkesztése"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Információ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Névjegyek"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"Mégse"</string>
<string name="ok" msgid="163967937451981024">"Rendben"</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="user_emergency_info_title" msgid="7827058167207376581">"Segélyhívási információk"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Az Ön által itt megadott információk segíthetnek az elsőként a helyszínre érkezőknek vészhelyzet esetén. Az információkat kizárólag a telefon tárolja, és bárki elolvashatja őket a segélyhívó tárcsázóján a telefon feloldása nélkül."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Tovább"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nincs információ a telefon tulajdonosáról"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"Ha ez az Ön telefonja, koppintson a ceruza ikonra, és adja meg azokat az adatokat, amelyeket vészhelyzet esetén itt megjeleníthetünk."</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"Ha ez az Ön telefonja, koppintson a ceruzára, és adja meg azokat az adatokat, amelyeket vészhelyzet esetén itt megjeleníthetünk."</string>
<string name="clear_all" msgid="8899013032870561633">"Összes törlése"</string>
<string name="clear" msgid="3648880442502887163">"Törlés"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Törli az összes információt és névjegyet?"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 4748edd..1781540 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -16,11 +16,13 @@
<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>
<string name="tab_title_info" msgid="1402033103294855812">"Տեղեկություններ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Կոնտակտներ"</string>
- <string name="name" msgid="4286267457738861977">"Անունը"</string>
+ <string name="name" msgid="4286267457738861977">"Անուն"</string>
<string name="unknown_name" msgid="2834802479170495056">"Անհայտ"</string>
<string name="address" msgid="6449303483151189969">"Հասցե"</string>
<string name="unknown_address" msgid="4212576729941786121">"Անհայտ"</string>
@@ -94,11 +96,8 @@
<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="user_emergency_info_title" msgid="7827058167207376581">"Անհետաձգելի բուժօգնության տվյալներ"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Արտակարգ իրավիճակների դեպքում այստեղ մուտքագրված ձեր բժշկական տվյալները և կոնտակտները կարող են օգտակար լինել առաջին օգնություն ցուցաբերողներին և փրկարարներին: Տվյալները պահվում են միայն ձեր սարքում և բոլորը կարող են կարդալ դրանք արտակարգ իրավիճակների համարհավաքիչից՝ առանց հեռախոսն ապակողպելու անհրաժեշտության:"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Շարունակել"</string>
<string name="no_info_provided" msgid="716200382010821001">"Հեռախոսի սեփականատիրոջ մասին տեղեկություններ չկան"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Եթե սա ձեր հեռախոսն է, ապա հպեք մատիտի պատկերակին և ավելացրեք տեղեկություններ, որոնք կցուցադրվեն այստեղ արտակարգ իրավիճակի դեպքում"</string>
<string name="clear_all" msgid="8899013032870561633">"Մաքրել բոլորը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d28368a..4206e26 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,6 +17,8 @@
<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">"Informasi darurat"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informasi medis"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edit informasi"</string>
<string name="edit_info" msgid="5973929805855224805">"Edit informasi darurat"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontak"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Batal"</string>
<string name="ok" msgid="163967937451981024">"Oke"</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="user_emergency_info_title" msgid="7827058167207376581">"Informasi darurat"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informasi yang Anda masukkan di sini dapat membantu perespons pertama dalam situasi darurat. Informasi tersebut hanya disimpan di perangkat, tetapi semua orang dapat membacanya dari telepon darurat tanpa membuka kunci ponsel."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Lanjutkan"</string>
<string name="no_info_provided" msgid="716200382010821001">"Tidak ada informasi tentang pemilik ponsel"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Jika ini ponsel Anda, ketuk ikon pensil untuk menambahkan informasi yang akan ditampilkan di sini jika terjadi keadaan darurat"</string>
<string name="clear_all" msgid="8899013032870561633">"Hapus semua"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 0a93bc6..c9cead3 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -17,6 +17,8 @@
<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">"Neyðarupplýsingar"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Læknisfræðilegar upplýsingar"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Breyta upplýsingum"</string>
<string name="edit_info" msgid="5973929805855224805">"Breyta neyðarupplýsingum"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Upplýsingar"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Tengiliðir"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Hætta við"</string>
<string name="ok" msgid="163967937451981024">"Í lagi"</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="user_emergency_info_title" msgid="7827058167207376581">"Neyðarupplýsingar"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Þær upplýsingar sem þú færir inn hér geta hjálpað þeim sem eru fyrstir á svæðið í neyðartilvikum. Upplýsingarnar eru aðeins geymdar í tækinu og hver sem er getur lesið þær í neyðarnúmeravalinu án þess að taka símann úr lás."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Halda áfram"</string>
<string name="no_info_provided" msgid="716200382010821001">"Engar upplýsingar um eiganda símans"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ef þetta er síminn þinn skaltu ýta á blýantstáknið til að bæta við upplýsingum sem birtast hér í neyðartilviki"</string>
<string name="clear_all" msgid="8899013032870561633">"Hreinsa allt"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 969c0c2..7f8691c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,8 +17,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">"Informazioni per le emergenze"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informazioni mediche"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Modifica informazioni"</string>
<string name="edit_info" msgid="5973929805855224805">"Modifica informazioni per le emergenze"</string>
- <string name="tab_title_info" msgid="1402033103294855812">"Informazioni"</string>
+ <string name="tab_title_info" msgid="1402033103294855812">"Dati"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contatti"</string>
<string name="name" msgid="4286267457738861977">"Nome"</string>
<string name="unknown_name" msgid="2834802479170495056">"Sconosciuto"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Annulla"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Informazioni per le emergenze"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Le informazioni inserite qui possono essere d\'aiuto ai primi soccorritori in caso di emergenza. Vengono memorizzate soltanto sul dispositivo e chiunque può leggerle durante la chiamata di emergenza senza sbloccare il telefono."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continua"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nessuna informazione sul proprietario del telefono"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Se questo è il tuo telefono, tocca l\'icona a forma di matita per aggiungere informazioni che verranno visualizzate qui in caso di emergenza"</string>
<string name="clear_all" msgid="8899013032870561633">"Cancella tutto"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index aff7746..a15fe80 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"מידע"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"אנשי קשר"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"ביטול"</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="user_emergency_info_title" msgid="7827058167207376581">"מידע למקרה חירום"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"מידע שתזין כאן יכול לעזור למגישי עזרה ראשונה במקרה חירום. הוא מאוחסן במכשיר שלך בלבד, אבל כל אחד יכול לקרוא אותו מחייגן החירום ללא ביטול נעילת הטלפון."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"המשך"</string>
<string name="no_info_provided" msgid="716200382010821001">"אין מידע על הבעלים של הטלפון"</string>
<string name="tap_pencil" msgid="2723698054265296934">"אם זהו הטלפון שלך, הקש על סמל העיפרון כדי להוסיף מידע שיוצג כאן במקרה חירום"</string>
<string name="clear_all" msgid="8899013032870561633">"נקה הכול"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fe3f701..0369c73 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"情報"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"連絡先"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"キャンセル"</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="user_emergency_info_title" msgid="7827058167207376581">"緊急情報"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ここで入力する情報は緊急時の初期対応に役立てられます。この情報が保存されるのはお使いのスマートフォンのみです。スマートフォンをロック解除しなくても緊急通報から誰でも閲覧することができます。"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"続行"</string>
<string name="no_info_provided" msgid="716200382010821001">"スマートフォンの所有者に関する情報はありません"</string>
<string name="tap_pencil" msgid="2723698054265296934">"あなたがこのスマートフォンを所有している場合は、鉛筆アイコンをタップして、緊急時にここに表示される情報を追加してください"</string>
<string name="clear_all" msgid="8899013032870561633">"すべて消去"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index d240d5c..22e27c2 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"ინფორმაცია"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"კონტაქტები"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"გაუქმება"</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="user_emergency_info_title" msgid="7827058167207376581">"საგანგებო ინფორმაცია"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"თქვენ მიერ აქ შეყვანილი ინფორმაცია საგანგებო ვითარებაში სწრაფი რეაგირების სამსახურებს შეუწყობს ხელს. ის მხოლოდ თქვენს მოწყობილობაზე შეინახება და ნებისმიერი პირი შეძლებს მის წაკითხვას საგანგებო დარეკვის აპიდან, თქვენი ტელეფონის განბლოკვის გარეშე."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"გაგრძელება"</string>
<string name="no_info_provided" msgid="716200382010821001">"ტელეფონის მფლობელის შესახებ ინფორმაცია არ არის"</string>
<string name="tap_pencil" msgid="2723698054265296934">"თუ ეს თქვენი ტელეფონია, შეეხეთ ფანქრის ხატულას და დაამატეთ ინფორმაცია, რომელიც აქ საგანგებო ვითარების შემთხვევაში გამოჩნდება"</string>
<string name="clear_all" msgid="8899013032870561633">"ყველაფრის გასუფთავება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 347e0a0..1d4a97c 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Ақпарат"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контактілер"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Бас тарту"</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="user_emergency_info_title" msgid="7827058167207376581">"Төтенше жағдайға арналған ақпарат"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Сіз мұнда енгізген ақпарат төтенше жағдайда алғашқы көмек көрсетушілерге көмектесуі мүмкін. Ол тек құрылғыңызда сақталады, әрі кез келген адам телефоныңыздың құлпын ашусыз оны төтенше жағдайдағы нөмір тергіштен оқи алады."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Жалғастыру"</string>
<string name="no_info_provided" msgid="716200382010821001">"Телефон иесі туралы ақпарат жоқ"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Егер бұл сіздің телефоныңыз болса, қалам белгішесін түртіп, төтенше жағдай орын алған жағдайда осы жерде көрсетілетін ақпаратты қосыңыз."</string>
<string name="clear_all" msgid="8899013032870561633">"Барлығын тазалау"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index eadd7e5..870e459 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"ព័ត៌មាន"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"ទំនាក់ទំនង"</string>
@@ -77,7 +79,7 @@
<string name="medications_hint" msgid="3221620025945593723">"ឧទាហរណ៍៖ ថ្នាំអាស្ពីរីន"</string>
<string name="medical_conditions" msgid="3555690011498283592">"កំណត់ហេតុវេជ្ជសាស្ត្រ"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"មិនស្គាល់"</string>
- <string name="medical_conditions_hint" msgid="6959152183029062882">"ឧទាហរណ៍៖ ជម្ងឺហឺត"</string>
+ <string name="medical_conditions_hint" msgid="6959152183029062882">"ឧទាហរណ៍៖ ជំងឺហឺត"</string>
<string name="organ_donor" msgid="5953509460007124827">"អ្នកបរិច្ចាគសរីរាង្គ"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"មិនស្គាល់"</string>
<string name="yes" msgid="5829765567799916128">"បាទ/ចាស"</string>
@@ -86,7 +88,7 @@
<!-- 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">"ទំនាក់ទំនងសង្គ្រោះបន្ទាន់"</string>
- <string name="add_emergency_contact" msgid="4063577069613981029">"បន្ថែមទំនាក់ទំនង"</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="remove_contact" msgid="6934983445723096759">"យក <xliff:g id="CONTACT_NAME">%1$s</xliff:g> ចេញពីទំនាក់ទំនងសង្គ្រោះបន្ទាន់ឬ?"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"បោះបង់"</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="user_emergency_info_title" msgid="7827058167207376581">"ព័ត៌មានបន្ទាន់"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ព័ត៌មានដែលអ្នកបញ្ចូលនៅទីនេះអាចជួយដល់អ្នកសង្គ្រោះបន្ទាន់ នៅពេលដែលមានអាសន្នកើតឡើង។ ព័ត៌មាននេះត្រូវបានផ្ទុកនៅក្នុងឧបករណ៍របស់អ្នកតែមួយគត់ ហើយអ្នកណាក៏អាចអានព័ត៌មាននេះបាននៅលើអេក្រង់ហៅទូរស័ព្ទសង្គ្រោះបន្ទាន់ដោយមិនចាំបាច់ដោះសោទូរស័ព្ទរបស់អ្នកឡើយ។"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"បន្ត"</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>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index e42b484..b83c25b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"ಮಾಹಿತಿ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"ಸಂಪರ್ಕಗಳು"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"ರದ್ದುಗೊಳಿಸು"</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="user_emergency_info_title" msgid="7827058167207376581">"ತುರ್ತು ಮಾಹಿತಿ"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ಇಲ್ಲಿ ನಮೂದಿಸುವ ಮಾಹಿತಿಯು ತುರ್ತುಪರಿಸ್ಥಿತಿಯಲ್ಲಿ ಮೊದಲು ಸಹಾಯಕ್ಕೆ ಬರುವವರಿಗೆ ಪ್ರಯೋಜನಕಾರಿಯಾಗಿರುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಸಂಗ್ರಹವಾಗಿರುತ್ತದೆ. ಇದನ್ನು ತುರ್ತು ಡಯಲರ್ನಲ್ಲಿ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡದೆಯೇ, ಯಾರು ಬೇಕಾದರೂ ಓದಬಹುದು."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ಮುಂದುವರಿಸು"</string>
<string name="no_info_provided" msgid="716200382010821001">"ಫೋನ್ನ ಮಾಲೀಕರ ಕುರಿತು ಯಾವುದೇ ಮಾಹಿತಿ ಇಲ್ಲ"</string>
<string name="tap_pencil" msgid="2723698054265296934">"ಇದು ನಿಮ್ಮ ಫೋನ್ ಆಗಿದ್ದಲ್ಲಿ, ತುರ್ತು ಸಂದರ್ಭದಲ್ಲಿ ಇಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲಾಗುವ ಮಾಹಿತಿಯನ್ನು ಸೇರಿಸಲು ಪೆನ್ಸಿಲ್ ಐಕಾನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="clear_all" msgid="8899013032870561633">"ತೆರವುಗೊಳಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c924acc..19ae438 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,9 +17,11 @@
<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="tab_title_info" msgid="1402033103294855812">"정보"</string>
- <string name="tab_title_contacts" msgid="4298341166404791209">"주소록"</string>
+ <string name="tab_title_contacts" msgid="4298341166404791209">"연락처"</string>
<string name="name" msgid="4286267457738861977">"이름"</string>
<string name="unknown_name" msgid="2834802479170495056">"알 수 없음"</string>
<string name="address" msgid="6449303483151189969">"주소"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"취소"</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="user_emergency_info_title" msgid="7827058167207376581">"긴급 상황 정보"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"이곳에 입력하는 정보는 긴급 상황의 초기 대처에 도움이 됩니다. 이 정보는 사용자의 기기에만 저장되지만, 누구나 스마트폰을 잠금 해제하지 않고도 긴급 다이얼러에서 이 정보를 볼 수 있습니다."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"계속"</string>
<string name="no_info_provided" msgid="716200382010821001">"휴대전화 소유자 정보 없음"</string>
<string name="tap_pencil" msgid="2723698054265296934">"본인 휴대전화인 경우 연필 아이콘을 탭하여 정보를 추가하세요. 긴급 상황 시 여기 표시됩니다."</string>
<string name="clear_all" msgid="8899013032870561633">"모두 삭제"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 3c934c0..f37e152 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -16,8 +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">"Өзгөчө кырдаал маалыматы"</string>
- <string name="edit_info" msgid="5973929805855224805">"Өзгөчө кырдаал маалыматын өзгөртүү"</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>
<string name="tab_title_info" msgid="1402033103294855812">"Маалымат"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Байланыштар"</string>
<string name="name" msgid="4286267457738861977">"Аты"</string>
@@ -93,14 +95,11 @@
<string name="remove_contact_icon_text" msgid="4576641386490101363">"Байланышты алып салуу"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"Байланыш маалыматы туура окулбай жатат"</string>
<string name="remove" msgid="1243949503772376064">"Алып салуу"</string>
- <string name="cancel" msgid="7401575239009060939">"Жокко чыгаруу"</string>
+ <string name="cancel" msgid="7401575239009060939">"Жок"</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="user_emergency_info_title" msgid="7827058167207376581">"Өзгөчө кырдаал маалыматы"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Бул жерде көрсөтүлгөн маалымат түзмөгүңүздө гана сакталат, бирок аны өзгөчө кырдаалда телефон кулпуланып турса да каалаган адам окуй алат."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Улантуу"</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>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 526ae64..5e4c3b9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"ຂໍ້ມູນ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"ຍົກເລີກ"</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="user_emergency_info_title" msgid="7827058167207376581">"ຂໍ້ມູນສຸກເສີນ"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ຂໍ້ມູນທີ່ທ່ານລະບຸຢູ່ບ່ອນນີ້ສາມາດຊ່ວຍໃນກໍລະນີສຸກເສີນໄດ້. ມັນຈະຖືກບັນທຶກໃນອຸປະກອນຂອງທ່ານເທົ່ານັ້ນ, ແຕ່ທຸກຄົນສາມາດເບິ່ງມັນໄດ້ຈາກໜ້າຈໍໂທສຸກເສີນໂດຍບໍ່ຕ້ອງປົດລັອກໂທລະສັບຂອງທ່ານ."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ສືບຕໍ່"</string>
<string name="no_info_provided" msgid="716200382010821001">"ບໍ່ມີຂໍ້ມູນກ່ຽວກັບເຈົ້າຂອງໂທລະສັບ"</string>
<string name="tap_pencil" msgid="2723698054265296934">"ຫາກນີ້ແມ່ນໂທລະສັບຂອງທ່ານ, ໃຫ້ແຕະທີ່ໄອຄອນຮູບສໍເພື່ອເພີ່ມຂໍ້ມູນທີ່ຈະສະແດງບ່ອນນີ້ໃນກໍລະນີສຸກເສີນ."</string>
<string name="clear_all" msgid="8899013032870561633">"ລຶບລ້າງທັງໝົດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 303e36c..5c34265 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -17,6 +17,8 @@
<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">"Kritinės padėties informacija"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medicininė informacija"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Redaguoti informaciją"</string>
<string name="edit_info" msgid="5973929805855224805">"Redaguoti kritinės padėties informaciją"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacija"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktai"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Atšaukti"</string>
<string name="ok" msgid="163967937451981024">"Gerai"</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="user_emergency_info_title" msgid="7827058167207376581">"Kritinės padėties informacija"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informacija, kurią įvedate čia, gali padėti pirmiems atsiliepusiems žmonėms kritiniu atveju. Ji saugoma tik jūsų įrenginyje ir visi žmonės gali ją perskaityti per pagalbos numerio rinkiklį neatrakinę telefono."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Tęsti"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nėra informacijos apie telefono savininką"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Jei tai jūsų telefonas, palieskite pieštuko piktogramą, kad pridėtumėte informaciją, kuri čia bus rodoma esant kritinei situacijai"</string>
<string name="clear_all" msgid="8899013032870561633">"Išvalyti viską"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9f3b84e..f5dea23 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,6 +17,8 @@
<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">"Ārkārtas informācija"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medicīniskā informācija"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Rediģēt informāciju"</string>
<string name="edit_info" msgid="5973929805855224805">"Rediģēt ārkārtas informāciju"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informācija"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktpersonas"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Atcelt"</string>
<string name="ok" msgid="163967937451981024">"Labi"</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="user_emergency_info_title" msgid="7827058167207376581">"Ārkārtas informācija"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Šeit ievadītā informācija var palīdzēt tiem, kas pirmie rīkosies ārkārtas situācijā. Tā tiks saglabāta tikai jūsu ierīcē, un ikviens varēs to izlasīt ārkārtas numuru sastādītāja ekrānā, neatbloķējot jūsu tālruni."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Turpināt"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nav informācijas par tālruņa īpašnieku."</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ja šis ir jūsu tālrunis, pieskarieties zīmuļa ikonai, lai pievienotu informāciju, kas tiks parādīta šeit ārkārtas gadījumā."</string>
<string name="clear_all" msgid="8899013032870561633">"Notīrīt visu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index a1ae45a..c141cac 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Информации"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контакти"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Откажи"</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="user_emergency_info_title" msgid="7827058167207376581">"Информации за итни случаи"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Информациите што ќе ги внесете тука може да им помогнат на првите лица што ќе реагираат при итен случај. Се чуваат само на вашиот уред и секој ќе може да ги прочита од бирачот за итни случаи без да го отклучи телефонот."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Продолжи"</string>
<string name="no_info_provided" msgid="716200382010821001">"Нема информации за сопственикот на телефонот"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ако ова е вашиот телефон, допрете ја иконата со молив за да додадете информации што ќе се прикажат тука во итен случај"</string>
<string name="clear_all" msgid="8899013032870561633">"Исчисти ги сите"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7470442..aab57f2 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"വിവരം"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"കോൺടാക്റ്റുകൾ"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"റദ്ദാക്കുക"</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="user_emergency_info_title" msgid="7827058167207376581">"അടിയന്തര വിവരം"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ഒരു അടിയന്തര സാഹചര്യത്തിൽ ആദ്യമായി പ്രതികരിക്കുന്നവർക്ക്, നിങ്ങൾ ഇവിടെ നൽകുന്ന വിവരങ്ങൾ സഹായകമാകും. ഈ വിവരങ്ങൾ നിങ്ങളുടെ ഉപകരണത്തിൽ മാത്രമാണ് സൂക്ഷിക്കുക, എമർജൻസി ഡയലറിൽ നിന്ന്, നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യാതെ തന്നെ, ആർക്കും ഈ വിവരങ്ങൾ വായിക്കാവുന്നതാണ്."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"തുടരുക"</string>
<string name="no_info_provided" msgid="716200382010821001">"ഫോൺ ഉടമയെ കുറിച്ചുള്ള വിവരങ്ങളൊന്നുമില്ല"</string>
<string name="tap_pencil" msgid="2723698054265296934">"ഇത് നിങ്ങളുടെ ഫോണാണെങ്കിൽ, അടിയന്തിര ഘട്ടത്തിൽ ഇവിടെ കാണിക്കേണ്ട വിവരങ്ങൾ ചേർക്കുന്നതിന് പെൻസിൽ ഐക്കണിൽ ടാപ്പുചെയ്യുക"</string>
<string name="clear_all" msgid="8899013032870561633">"എല്ലാം മായ്ക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 9477d68..1c61276 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Мэдээлэл"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Харилцагчийн хаяг"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Цуцлах"</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="user_emergency_info_title" msgid="7827058167207376581">"Яаралтай тусламжийн мэдээлэл"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Таны энд оруулсан мэдээллийг онцгой тохиолдолд танд анхлан туслахад ашиглана. Уг мэдээлэл нь зөвхөн таны төхөөрөмжид хадгалагдаж, үүнийг хэн нэгэн таны утасны түгжээг тайлалгүйгээр онцгой үед залгах хэсгээс харж болно."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Үргэлжлүүлэх"</string>
<string name="no_info_provided" msgid="716200382010821001">"Утасны эзний талаар мэдээлэл алга"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Хэрэв энэ таны утас бол балны дүрс тэмдгийг дарж, онцгой байдлын үед харагдах мэдээлэл оруулна уу."</string>
<string name="clear_all" msgid="8899013032870561633">"Бүгдийг арилгах"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 04eb407..4ba3a23 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"माहिती"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"संपर्क"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"रद्द करा"</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="user_emergency_info_title" msgid="7827058167207376581">"आणीबाणी माहिती"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"आपण येथे प्रविष्ट करता ती माहिती आणीबाणीमध्ये प्रथम प्रतिसादकर्त्यांना मदत करू शकते. ती फक्त आपल्या डिव्हाइसवर संचयित केली जाते आणि आपला फोन अनलॉक न करता ती आणीबाणी डायलर मधून कोणीही वाचू शकतो."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"सुरू ठेवा"</string>
<string name="no_info_provided" msgid="716200382010821001">"फोनच्या मालकाविषयी कोणतीही माहिती नाही"</string>
<string name="tap_pencil" msgid="2723698054265296934">"हा आपला फोन असल्यास, आणीबाणी असताना येथे प्रदर्शित केली जाणारी माहिती जोडण्यासाठी पेन्सिल चिन्हावर टॅप करा"</string>
<string name="clear_all" msgid="8899013032870561633">"सर्व साफ करा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b74ff98..a821941 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -17,6 +17,8 @@
<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">"Maklumat kecemasan"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Maklumat perubatan"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edit maklumat"</string>
<string name="edit_info" msgid="5973929805855224805">"Edit maklumat kecemasan"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Maklumat"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Hubungan"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Batal"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Maklumat kecemasan"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Maklumat yang anda masukkan di sini dapat membantu petugas kecemasan dalam kes kecemasan. Maklumat ini disimpan pada peranti anda sahaja dan sesiapa sahaja dapat membacanya daripada pendail kecemasan tanpa membuka kunci telefon anda."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Teruskan"</string>
<string name="no_info_provided" msgid="716200382010821001">"Tiada maklumat tentang pemilik telefon"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Jika ini telefon anda, ketik ikon pensel untuk menambah maklumat yang akan dipaparkan di sini sekiranya berlaku kecemasan"</string>
<string name="clear_all" msgid="8899013032870561633">"Kosongkan semua"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index fca2f48..05bf464 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"အချက်အလက်"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"အဆက်အသွယ်များ"</string>
@@ -96,12 +98,9 @@
<string name="cancel" msgid="7401575239009060939">"မလုပ်တော့"</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="user_emergency_info_title" msgid="7827058167207376581">"အရေးပေါ်အချက်အလက်"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ဤနေရာတွင် သင်ထည့်သွင်းထားသည့် အချက်အလက်များသည် အရေးပေါ်အခြေအနေတွင် ပထမတုံ့ပြန်သူကို အကူအညီပေးနိုင်ပါမည်။ ၎င်းကို သင့်စက်ပစ္စည်းထဲတွင်သာ သိမ်းဆည်းထားခြင်းဖြစ်ပြီး၊ သင့်ဖုန်းကို လော့ခ်ဖွင့်စရာမလိုဘဲ မည်သူမဆို အရေးပေါ်ခလုတ်မှ ဖတ်နိုင်ပါသည်။"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ဆက်လုပ်ရန်"</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_all" msgid="8899013032870561633">"အားလုံး ရှင်းပါ"</string>
<string name="clear" msgid="3648880442502887163">"ရှင်းရန်"</string>
- <string name="clear_all_message" msgid="1548432000373861295">"အချက်အလက်များနှင့် အဆက်အသွယ်များအားလုံးကို ဖယ်ရှားမလား။"</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"အချက်အလက်နှင့် အဆက်အသွယ်အားလုံးကို ရှင်းမလား။"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8989f4e..7d4a356 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,6 +17,8 @@
<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">"Informasjon for nødstilfeller"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medisinsk informasjon"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Rediger informasjon"</string>
<string name="edit_info" msgid="5973929805855224805">"Endre informasjonen for nødstilfeller"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informasjon"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakter"</string>
@@ -69,7 +71,7 @@
<string name="ab_positive" msgid="1931300033534642005">"A B positiv"</string>
<string name="ab_negative" msgid="2064555613093591729">"A B negativ"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
- <string name="allergies" msgid="2789200777539258165">"Allergi"</string>
+ <string name="allergies" msgid="2789200777539258165">"Allergier"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Ukjent"</string>
<string name="allergies_hint" msgid="5488918780522184147">"For eksempel peanøtter"</string>
<string name="medications" msgid="644428945685557183">"Medisiner"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Avbryt"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Informasjon for nødstilfeller"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informasjonen du skriver inn her, kan hjelpe dem som ankommer ulykkesstedet først ved eventuelle ulykker. Opplysningene er bare lagret på enheten din, og hvem som helst kan lese dem via alternativet for nødanrop uten å låse opp enheten."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Fortsett"</string>
<string name="no_info_provided" msgid="716200382010821001">"Ingen informasjon om telefonens eier"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Hvis dette er din telefon, kan du trykke på blyantikonet for å legge til informasjon som skal vises her i nødstilfeller"</string>
<string name="clear_all" msgid="8899013032870561633">"Fjern alt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9267eb6..6bae5b3 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"सम्पर्कहरू"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"रद्द गर्नुहोस्"</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="user_emergency_info_title" msgid="7827058167207376581">"आपतकालीन जानकारी"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"तपाईँले यहाँ प्रविष्ट गर्नु हुने जानकारीले आपतकालीन अवस्थामा सहयोग पुर्याउने पहिला व्यक्तिहरूलाई मद्दत गर्न सक्छ। यसलाई तपाईँको यन्त्रमा मात्र भण्डारण गरिन्छ र कसैले पनि तपाईँको फोनलाई अनलक नगरिकन आपतकालीन अवस्थाको डायलरबाट यसलाई पढ्न सक्छ।"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"जारी राख्नुहोस्"</string>
<string name="no_info_provided" msgid="716200382010821001">"यस फोनको मालिक बारे कुनै जानकारी छैन"</string>
<string name="tap_pencil" msgid="2723698054265296934">"यदि यो तपाईँको फोन हो भने आपतकालीन अवस्थामा यहाँ प्रदर्शन गरिने जानकारी थप्न पेन्सिलको आइकनमा ट्याप गर्नुहोस्"</string>
<string name="clear_all" msgid="8899013032870561633">"सबै हटाउनुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8aadcbb..fe03e72 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,6 +17,8 @@
<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">"Informatie bij nood"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medische informatie"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Informatie bewerken"</string>
<string name="edit_info" msgid="5973929805855224805">"Informatie bij nood bewerken"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informatie"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contacten"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Annuleren"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Informatie bij nood"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informatie die je hier opgeeft, kan worden gebruikt om in een noodgeval contact op te nemen met je naasten. De informatie wordt alleen opgeslagen op je apparaat en iedereen kan deze bekijken via de kiezer voor noodoproepen zonder je telefoon te ontgrendelen."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Doorgaan"</string>
<string name="no_info_provided" msgid="716200382010821001">"Geen informatie over de eigenaar van de telefoon"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Als dit je telefoon is, tik je op het potloodpictogram om informatie toe te voegen die hier wordt weergegeven in geval van nood"</string>
<string name="clear_all" msgid="8899013032870561633">"Alles wissen"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 572c2f9..9f19187 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"ਜਾਣਕਾਰੀ"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"ਸੰਪਰਕ"</string>
@@ -96,12 +98,9 @@
<string name="cancel" msgid="7401575239009060939">"ਰੱਦ ਕਰੋ"</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="user_emergency_info_title" msgid="7827058167207376581">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਇੱਥੇ ਦਾਖਲ ਕੀਤੀ ਜਾਣਕਾਰੀ ਸੰਕਟਕਾਲ ਵਿੱਚ ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਪਹੁੰਚਣ ਵਾਲੇ ਲੋਕਾਂ ਦੀ ਮਦਦ ਕਰ ਸਕਦੀ ਹੈ। ਇਸ ਨੂੰ ਸਿਰਫ਼ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਅਤੇ ਕੋਈ ਵੀ ਤੁਹਾਡੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਿਨਾਂ ਇਸ ਨੂੰ ਸੰਕਟਕਾਲ ਡਾਇਲਰ ਤੋਂ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ਜਾਰੀ ਰੱਖੋ"</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" msgid="8899013032870561633">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string>
+ <string name="clear" msgid="3648880442502887163">"ਕਲੀਅਰ ਕਰੋ"</string>
<string name="clear_all_message" msgid="1548432000373861295">"ਕੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e2a797a..9ed8674 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,20 +17,22 @@
<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">"Informacje alarmowe"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informacje medyczne"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Edytuj informacje"</string>
<string name="edit_info" msgid="5973929805855224805">"Edytuj informacje alarmowe"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacje"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakty"</string>
<string name="name" msgid="4286267457738861977">"Imię i nazwisko"</string>
- <string name="unknown_name" msgid="2834802479170495056">"Nieznane"</string>
+ <string name="unknown_name" msgid="2834802479170495056">"Brak informacji"</string>
<string name="address" msgid="6449303483151189969">"Adres"</string>
- <string name="unknown_address" msgid="4212576729941786121">"Nieznany"</string>
+ <string name="unknown_address" msgid="4212576729941786121">"Brak informacji"</string>
<string name="date_of_birth" msgid="777979232444227891">"Data urodzenia"</string>
- <string name="unknown_date_of_birth" msgid="7416355536916066758">"Nieznana"</string>
+ <string name="unknown_date_of_birth" msgid="7416355536916066758">"Brak informacji"</string>
<string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
<string name="age" msgid="8327537794752630199">"Wiek: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
<string name="remove_dob_icon_text" msgid="4413507180967999944">"Usuń datę urodzenia"</string>
<string name="blood_type" msgid="6947022772999974608">"Grupa krwi"</string>
- <string name="unknown_blood_type" msgid="6337228278125085668">"Nieznana"</string>
+ <string name="unknown_blood_type" msgid="6337228278125085668">"Brak informacji"</string>
<string name="oplus" msgid="7759756742377867011">"0+"</string>
<string name="ominus" msgid="5227278501191741055">"0-"</string>
<string name="aplus" msgid="4982472245421753463">"A+"</string>
@@ -70,16 +72,16 @@
<string name="ab_negative" msgid="2064555613093591729">"A B minus"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
<string name="allergies" msgid="2789200777539258165">"Alergie"</string>
- <string name="unknown_allergies" msgid="4383115953418061237">"Nieznane"</string>
+ <string name="unknown_allergies" msgid="4383115953418061237">"Brak informacji"</string>
<string name="allergies_hint" msgid="5488918780522184147">"Na przykład orzeszki ziemne"</string>
<string name="medications" msgid="644428945685557183">"Leki"</string>
- <string name="unknown_medications" msgid="2764171064510423734">"Nieznane"</string>
+ <string name="unknown_medications" msgid="2764171064510423734">"Brak informacji"</string>
<string name="medications_hint" msgid="3221620025945593723">"Na przykład aspiryna"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Uwagi medyczne"</string>
- <string name="unknown_medical_conditions" msgid="8051364895172053770">"Nieznane"</string>
+ <string name="unknown_medical_conditions" msgid="8051364895172053770">"Brak informacji"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Na przykład astma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Dawca narządów"</string>
- <string name="unknown_organ_donor" msgid="2780515342875494225">"Nieznana"</string>
+ <string name="unknown_organ_donor" msgid="2780515342875494225">"Brak informacji"</string>
<string name="yes" msgid="5829765567799916128">"Tak"</string>
<string name="no" msgid="1681689233660683509">"Nie"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Anuluj"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Informacje alarmowe"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informacje, które tu podasz, mogą pomóc w sytuacji awaryjnej. Są przechowywane tylko na Twoim urządzeniu i każdy może je odczytać w funkcji połączeń alarmowych bez odblokowywania telefonu."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Dalej"</string>
<string name="no_info_provided" msgid="716200382010821001">"Brak informacji o właścicielu telefonu"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Jeśli to Twój telefon, kliknij ikonę ołówka, by dodać informacje, które będą tutaj wyświetlane w sytuacji awaryjnej"</string>
<string name="clear_all" msgid="8899013032870561633">"Wyczyść wszystko"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 036f9d5..2ac5382 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,6 +17,8 @@
<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">"Informações de emergência"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informações médicas"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Editar informações"</string>
<string name="edit_info" msgid="5973929805855224805">"Editar informações de emergência"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informações"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Cancelar"</string>
<string name="ok" msgid="163967937451981024">"Ok"</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="user_emergency_info_title" msgid="7827058167207376581">"Informações de emergência"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"As informações aqui introduzidas podem ajudar os socorristas numa emergência. São armazenadas apenas no seu dispositivo e qualquer pessoa as pode ler a partir do teclado de emergência sem desbloquear o telemóvel."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuar"</string>
<string name="no_info_provided" msgid="716200382010821001">"Sem informações acerca do proprietário do telemóvel"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Se este for o seu telemóvel, toque no ícone de lápis para adicionar informações que serão apresentadas aqui em caso de emergência"</string>
<string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d54f3f9..3b364e2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,6 +17,8 @@
<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">"Informações de emergência"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informações médicas"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Editar informações"</string>
<string name="edit_info" msgid="5973929805855224805">"Edita as informações de emergência"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informações"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contatos"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Cancelar"</string>
<string name="ok" msgid="163967937451981024">"Ok"</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="user_emergency_info_title" msgid="7827058167207376581">"Informações de emergência"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"As informações fornecidas aqui podem ajudar socorristas em caso de emergência. Elas são armazenadas apenas no seu dispositivo, mas qualquer pessoa pode lê-las no discador de emergência sem desbloquear o smartphone."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuar"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nenhuma informação sobre o proprietário do smartphone"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Se este smartphone for seu, toque no ícone de lápis para adicionar informações que serão exibidas aqui em caso de emergência"</string>
<string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index caa7fc0..69cadee 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,6 +17,8 @@
<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">"Informații în caz de urgență"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informații medicale"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Editați informațiile"</string>
<string name="edit_info" msgid="5973929805855224805">"Editați informațiile afișate în caz de urgență"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informații"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Persoane"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Anulați"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Informații în caz de urgență"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informațiile introduse aici pot fi utile celor care acordă primul ajutor într-o situație de urgență. Sunt stocate doar pe dispozitiv și oricine le poate citi din tastatura numerică de urgență, fără să deblocheze telefonul."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Continuați"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nu există informații despre proprietarul telefonului"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Dacă acesta este telefonul dvs., atingeți pictograma creion pentru a adăuga informații care vor fi afișate aici în caz de urgență"</string>
<string name="clear_all" msgid="8899013032870561633">"Ștergeți tot"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8c4ea27..7202700 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Сведения"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контакты"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Отмена"</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="user_emergency_info_title" msgid="7827058167207376581">"Данные для экстренных случаев"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Информация, которую вы укажете здесь, сохранится только на вашем устройстве. Она будет доступна всем на экране вызова экстренных служб без разблокировки телефона."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Продолжить"</string>
<string name="no_info_provided" msgid="716200382010821001">"Нет сведений о владельце"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Если телефон ваш, нажмите на значок карандаша и укажите информацию на случай экстренной ситуации."</string>
<string name="clear_all" msgid="8899013032870561633">"Очистить все"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 8835f92..39464c7 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"තොරතුරු"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"සම්බන්ධතා"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"අවලංගු කරන්න"</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="user_emergency_info_title" msgid="7827058167207376581">"හදිසි අවස්ථා තොරතුරු"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ඔබ මෙහි ඇතුළු කළ තොරතුරු හදිසි අවස්ථාවකදී පළමු ප්රතිචාර දක්වන්නන්ට උදවු විය හැකිය. එය ඔබේ උපාංගය මත පමණක් ගබඩා වනු ඇත, නමුත් ඕනෑම කෙනෙකුට ඔබේ දුරකථනය අගුලු හැරීමෙන් තොරව හදිසි අවස්ථා අමතනය වෙතින් එය කියවිය හැකිය."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"දිගටම කර ගෙන යන්න"</string>
<string name="no_info_provided" msgid="716200382010821001">"දුරකථනයේ හිමිකරු ගැන තොරතුරු නැත"</string>
<string name="tap_pencil" msgid="2723698054265296934">"මෙය ඔබේ දුරකථනය නම්, හදිසි අවස්ථාවක මෙහි දර්ශනය වනු ලබන තොරතුරු එක් කිරීමට පැන්සල් නිරූපකය තට්ටු කරන්න"</string>
<string name="clear_all" msgid="8899013032870561633">"සියල්ල හිස් කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 312b1ac..ddc5ea0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -16,8 +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">"Núdzové informácie"</string>
- <string name="edit_info" msgid="5973929805855224805">"Upraviť núdzové informácie"</string>
+ <string name="app_label" msgid="1090682794607161063">"Tiesňové informácie"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Zdravotné informácie"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Upraviť informácie"</string>
+ <string name="edit_info" msgid="5973929805855224805">"Upraviť tiesňové informácie"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informácie"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakty"</string>
<string name="name" msgid="4286267457738861977">"Meno"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"Zrušiť"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Núdzové informácie"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Tu uvedené informácie pomôžu záchranárom, ak sa ocitnete v núdzovej situácii. Sú uložené iba na zariadení. Ktokoľvek si ich môže prečítať na obrazovke tiesňového vytáčania bez nutnosti odomknúť telefón."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Pokračovať"</string>
<string name="no_info_provided" msgid="716200382010821001">"Žiadne informácie o vlastníkovi telefónu"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"Ak je toto váš telefón, klepnite na ikonu ceruzky a pridajte informácie, ktoré sa tu zobrazia v prípade núdze"</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"Ak je toto váš telefón, klepnite na ikonu ceruzky a pridajte informácie, ktoré sa tu zobrazia v prípade tiesne"</string>
<string name="clear_all" msgid="8899013032870561633">"Vymazať všetko"</string>
<string name="clear" msgid="3648880442502887163">"Vymazať"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Vymazať všetky informácie a kontakty?"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 965e8db..251c07a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -17,6 +17,8 @@
<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">"Informacije za nujne primere"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Zdravstveni podatki"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Urejanje podatkov"</string>
<string name="edit_info" msgid="5973929805855224805">"Urejanje informacij za nujne primere"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Stiki"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Prekliči"</string>
<string name="ok" msgid="163967937451981024">"V REDU"</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="user_emergency_info_title" msgid="7827058167207376581">"Informacije za nujne primere"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Podatki, ki jih vnesete tukaj, lahko v nujnih primerih pomagajo prvim, ki priskočijo na pomoč. Shranjeni so samo v napravi in jih lahko v klicalniku za nujne primere brez odklepanja telefona prebere vsakdo."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Naprej"</string>
<string name="no_info_provided" msgid="716200382010821001">"Ni podatkov o lastniku telefona"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Če je to vaš telefon, se dotaknite ikone svinčnika, da dodate podatke, ki bodo prikazani tukaj za nujne primere."</string>
<string name="clear_all" msgid="8899013032870561633">"Izbriši vse"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c71e1b8..7a9def2 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -17,6 +17,8 @@
<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">"Informacioni i urgjencës"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Informacionet mjekësore"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Redakto informacionet"</string>
<string name="edit_info" msgid="5973929805855224805">"Redakto informacionin e urgjencës"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informacione"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktet"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Anulo"</string>
<string name="ok" msgid="163967937451981024">"Në rregull"</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="user_emergency_info_title" msgid="7827058167207376581">"Informacioni i urgjencës"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Informacionet që fut këtu mund t\'i ndihmojnë personat e parë që përgjigjen në rast urgjence. Ato ruhen vetëm në pajisjen tënde dhe çdo person mund t\'i lexojë nga formuesi i numrit i urgjencës pa e shkyçur telefonin."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Vazhdo"</string>
<string name="no_info_provided" msgid="716200382010821001">"Nuk ka informacione mbi zotëruesin e telefonit"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Nëse ky është telefoni yt, trokit tek ikona e lapsit për të shtuar informacione që do të shfaqen këtu në rast urgjence"</string>
<string name="clear_all" msgid="8899013032870561633">"Pastroji të gjitha"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7f0357e..a594c9d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Информације"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контакти"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Откажи"</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="user_emergency_info_title" msgid="7827058167207376581">"Информације за хитне случајеве"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Информације које овде унесете могу да помогну екипама хитних служби у хитним случајевима. Чувају се само на уређају и свако може да их прочита из апликације за позиве у хитним случајевима без откључавања телефона."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Настави"</string>
<string name="no_info_provided" msgid="716200382010821001">"Нема информација о власнику телефона"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ако је ово ваш телефон, додирните икону оловке да бисте додали информације које ће се приказивати овде у хитном случају"</string>
<string name="clear_all" msgid="8899013032870561633">"Обриши све"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6ca1b23..50b0bc3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,6 +17,8 @@
<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">"Krisinformation"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medicinsk information"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Redigera information"</string>
<string name="edit_info" msgid="5973929805855224805">"Redigera krisinformation"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Information"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontakter"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Avbryt"</string>
<string name="ok" msgid="163967937451981024">"Ok"</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="user_emergency_info_title" msgid="7827058167207376581">"Krisinformation"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Den information som du anger här kan hjälpa räddningspersonal vid en nödsituation. Den finns bara lagrad på enheten och vem som helst kan läsa den från skärmen för nödsamtal utan att låsa upp mobilen."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Fortsätt"</string>
<string name="no_info_provided" msgid="716200382010821001">"Det finns inga uppgifter om mobilens ägare"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Om det här är din mobil trycker du på pennikonen för att lägga till uppgifter som visas här i nödsituationer"</string>
<string name="clear_all" msgid="8899013032870561633">"Rensa alla"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a54cf83..b0be760 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,6 +17,8 @@
<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">"Maelezo ya dharura"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Maelezo ya matibabu"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Badilisha maelezo"</string>
<string name="edit_info" msgid="5973929805855224805">"Badilisha maelezo ya dharura"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Maelezo"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Anwani"</string>
@@ -78,7 +80,7 @@
<string name="medical_conditions" msgid="3555690011498283592">"Madokezo ya matibabu"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Haijulikani"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Kwa mfano, pumu"</string>
- <string name="organ_donor" msgid="5953509460007124827">"Mfadhili wa kiungo cha mwili"</string>
+ <string name="organ_donor" msgid="5953509460007124827">"Mchangia kiungo cha mwili"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"Haijulikani"</string>
<string name="yes" msgid="5829765567799916128">"Ndiyo"</string>
<string name="no" msgid="1681689233660683509">"Hapana"</string>
@@ -96,12 +98,9 @@
<string name="cancel" msgid="7401575239009060939">"Ghairi"</string>
<string name="ok" msgid="163967937451981024">"Sawa"</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="user_emergency_info_title" msgid="7827058167207376581">"Maelezo ya dharura"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Maelezo unayoandika hapa yanaweza kuwasaidia watu wa kwanza kuchukua hatua jambo la dharura likitokea. Maelezo haya huhifadhiwa kwenye kifaa chako pekee na mtu yeyote anaweza kuyasoma kutoka kipiga simu ya dharura bila kufungua simu yako."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Endelea"</string>
- <string name="no_info_provided" msgid="716200382010821001">"Hatuna maelezo kuhusu mmiliki wa simu"</string>
+ <string name="no_info_provided" msgid="716200382010821001">"Hatuna maelezo kuhusu mwenye simu hii"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ikiwa hii ni simu yako, gonga aikoni ya penseli ili uongeze maelezo ambayo yataonekana hapa wakati wa dharura."</string>
<string name="clear_all" msgid="8899013032870561633">"Futa yote"</string>
<string name="clear" msgid="3648880442502887163">"Futa"</string>
- <string name="clear_all_message" msgid="1548432000373861295">"Ungependa kufuta maelezo na anwani zote?"</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"Je, ungependa kufuta maelezo na anwani zote?"</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4dffc8e..2da3aca 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"தகவல்"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"தொடர்புகள்"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"ரத்துசெய்"</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="user_emergency_info_title" msgid="7827058167207376581">"அவசரத் தகவல்"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"இங்கே உள்ளிடும் தகவலானது அவசரச் சூழல்களில் முதலில் உங்களுக்கு உதவ முன்வருபவர்களுக்கு உதவும். இது உங்கள் சாதனத்தில் மட்டும் சேமிக்கப்பட்டிருக்கும், மேலும் உங்கள் மொபைலைத் திறக்காமல் அவசர அழைப்பு டயலரில் எவரும் படிக்கலாம்."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"தொடரவும்"</string>
<string name="no_info_provided" msgid="716200382010821001">"மொபைலின் உரிமையாளர் பற்றிய தகவல் இல்லை"</string>
<string name="tap_pencil" msgid="2723698054265296934">"இது உங்கள் மொபைலாக இருந்தால், அவசரச் சூழலில் இங்கே காட்டப்பட வேண்டிய தகவலைச் சேர்க்க, பென்சில் ஐகானைத் தட்டவும்"</string>
<string name="clear_all" msgid="8899013032870561633">"அனைத்தையும் அழி"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5c1a831..13f8253 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"సమాచారం"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"పరిచయాలు"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"రద్దు చేయి"</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="user_emergency_info_title" msgid="7827058167207376581">"అత్యవసర సమాచారం"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"మీరు ఇక్కడ నమోదు చేసే సమాచారం అత్యవసర సమయంలో ముందుగా ప్రతిస్పందించే వారికి సహాయపడగలదు. ఇది మీ పరికరంలో మాత్రమే నిల్వ చేయబడి ఉంటుంది మరియు మీ ఫోన్ను అన్లాక్ చేయకుండానే ఎవరైనా అత్యవసర డయలర్ నుండి దీన్ని చదవగలరు."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"కొనసాగించు"</string>
<string name="no_info_provided" msgid="716200382010821001">"ఫోన్ యజమాని గురించి సమాచారం ఏదీ లేదు"</string>
<string name="tap_pencil" msgid="2723698054265296934">"ఇది మీ ఫోన్ అయితే, అత్యవసర పరిస్థితి తలెత్తే సందర్భాల కోసం ఇక్కడ ప్రదర్శించబడే సమాచారాన్ని జోడించడానికి పెన్సిల్ చిహ్నాన్ని నొక్కండి"</string>
<string name="clear_all" msgid="8899013032870561633">"అన్నీ తీసివేయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c5af728..aad65a5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"ข้อมูล"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"รายชื่อติดต่อ"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"ยกเลิก"</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="user_emergency_info_title" msgid="7827058167207376581">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"ข้อมูลที่คุณป้อนที่นี่จะช่วยผู้ที่เข้ามาช่วยเหลือเป็นคนแรกได้ในกรณีฉุกเฉิน โดยระบบจะจัดเก็บข้อมูลนี้ไว้ในอุปกรณ์ของคุณเท่านั้น และทุกคนจะอ่านได้จากโปรแกรมโทรฉุกเฉินโดยไม่ต้องปลดล็อกโทรศัพท์ของคุณ"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"ต่อไป"</string>
<string name="no_info_provided" msgid="716200382010821001">"ไม่มีข้อมูลเกี่ยวกับเจ้าของโทรศัพท์"</string>
<string name="tap_pencil" msgid="2723698054265296934">"หากโทรศัพท์เครื่องนี้เป็นของคุณ ให้แตะไอคอนรูปดินสอเพื่อเพิ่มข้อมูลที่จะแสดงที่นี่ในกรณีฉุกเฉิน"</string>
<string name="clear_all" msgid="8899013032870561633">"ล้างทั้งหมด"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 70f0ed5..314713a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,6 +17,8 @@
<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">"Impormasyong pang-emergency"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Medikal na impormasyon"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"I-edit ang impormasyon"</string>
<string name="edit_info" msgid="5973929805855224805">"I-edit ang impormasyong pang-emergency"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Impormasyon"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Mga Contact"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Kanselahin"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Impormasyong pang-emergency"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Makakatulong ang impormasyong ilalagay mo rito sa mga unang reresponde sa panahon ng isang emergency. Sa iyong device lang ito nakaimbak at mababasa ito ng kahit sino mula sa emergency dialer nang hindi ina-unlock ang iyong telepono."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Magpatuloy"</string>
<string name="no_info_provided" msgid="716200382010821001">"Walang impormasyon tungkol sa may-ari ng telepono"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Kung telepono mo ito, i-tap ang icon na lapis upang magdagdag ng impormasyon na ipapakita rito kung sakaling may emergency"</string>
<string name="clear_all" msgid="8899013032870561633">"I-clear lahat"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 52a556e..00bd737 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -17,6 +17,8 @@
<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">"Acil durum bilgileri"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Tıbbi bilgi"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Bilgileri düzenle"</string>
<string name="edit_info" msgid="5973929805855224805">"Acil durum bilgilerini güncelle"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Bilgi"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kişiler"</string>
@@ -96,12 +98,9 @@
<string name="cancel" msgid="7401575239009060939">"İptal"</string>
<string name="ok" msgid="163967937451981024">"Tamam"</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="user_emergency_info_title" msgid="7827058167207376581">"Acil durum bilgileri"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Buraya girdiğiniz bilgiler, acil bir durumda ilk müdahale eden kişilere yardımcı olabilir. Bu bilgiler yalnızca cihazınızda depolanmıştır ve herhangi biri, telefonunuzun kilidini açmadan bu bilgileri acil durum numara çeviricisinden okuyabilir."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Devam"</string>
<string name="no_info_provided" msgid="716200382010821001">"Telefonun sahibiyle ilgili bilgi yok"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Bu telefon size aitse, acil durumda burada görüntülenecek bilgileri eklemek için kalem simgesine dokunun"</string>
<string name="clear_all" msgid="8899013032870561633">"Tümünü temizle"</string>
<string name="clear" msgid="3648880442502887163">"Temizle"</string>
- <string name="clear_all_message" msgid="1548432000373861295">"Tüm veriler ve kişiler temizlensin mi?"</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"Tüm bilgiler ve kişiler temizlensin mi?"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6df2e1e..ae03214 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"Інформація"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контакти"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Скасувати"</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="user_emergency_info_title" msgid="7827058167207376581">"Дані для екстр. вип."</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Інформація, яку ви тут вводите, може допомогти в надзвичайних ситуаціях. Вона зберігається лише на вашому пристрої, але її може прочитати будь-яка людина навіть на заблокованому телефоні, відкривши екран екстреного виклику."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Продовжити"</string>
<string name="no_info_provided" msgid="716200382010821001">"Немає інформації про власника телефона"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Якщо це ваш телефон, торкніться значка олівця, щоб додати інформацію, яка відображатиметься тут в екстреній ситуації"</string>
<string name="clear_all" msgid="8899013032870561633">"Очистити все"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 466c8af..4e036e4 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"معلومات"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"رابطے"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"منسوخ کریں"</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="user_emergency_info_title" msgid="7827058167207376581">"ہنگامی معلومات"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"جو معلومات آپ یہاں درج کرتے ہیں وہ ہنگامی صورتحال میں ابتدائی رضاکاروں کیلئے مددگار ہو سکتی ہیں۔ یہ صرف آپ کے آلہ پر محفوظ ہوتی ہے اور آپ کا فون غیر مقفل کئے بغیر کوئی بھی اسے ہنگامی ڈائلر سے پڑھ سکتا ہے۔"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"جاری رکھیں"</string>
<string name="no_info_provided" msgid="716200382010821001">"فون کے مالک کے بارے میں کوئی معلومات نہیں ہے"</string>
<string name="tap_pencil" msgid="2723698054265296934">"اگر یہ آپ کا فون ہے تو پینسل آئیکن کو تھپتھپا کر معلومات شامل کریں جو ایمرجنسی کی صورت میں یہاں ظاہر ہو گی"</string>
<string name="clear_all" msgid="8899013032870561633">"سبھی کو صاف کریں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index e898e37..def37cd 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -17,6 +17,8 @@
<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">"Favqulodda axborot"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Tibbiy ma’lumotlar"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Ma’lumotlarni tahrirlash"</string>
<string name="edit_info" msgid="5973929805855224805">"Favqulodda vaziyatlar uchun axborotni tahrirlash"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Ma’lumot"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktlar"</string>
@@ -86,7 +88,7 @@
<!-- 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">"Favqulodda holatlar uchun kontaktlar"</string>
- <string name="add_emergency_contact" msgid="4063577069613981029">"Kontakt qo‘shish"</string>
+ <string name="add_emergency_contact" msgid="4063577069613981029">"Kontakt saqlash"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"Kontakt tanlash vositasini topib bo‘lmadi"</string>
<string name="fail_display_contact" msgid="4128854688897045879">"Kontaktni ko‘rsatib bo‘lmadi"</string>
<string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> favqulodda holatlar uchun kontaktlardan olib tashlansinmi?"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Bekor qilish"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Favqulodda vaziyatlar uchun axborot"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Bu yerda kiritiladigan ma’lumotlar faqat qurilmangizda saqlanadi. Ular telefoningiz qulfini ochmasdan turib favqulodda xizmatlarga qo‘ng‘iroq qilish vaqtida hammaga ko‘rinadi."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Davom etish"</string>
<string name="no_info_provided" msgid="716200382010821001">"Telefon egasi haqida ma’lumot yo‘q"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Agar bu sizning telefoningiz bo‘lsa, bu yerda favqulodda holatlarda ko‘rsatiladigan ma’lumotlarni qo‘shish uchun qalam belgisini bosing"</string>
<string name="clear_all" msgid="8899013032870561633">"Hammasini o‘chirish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 83b07e9..a0fdbcc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -17,6 +17,8 @@
<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">"Thông tin khẩn cấp"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Thông tin y tế"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Chỉnh sửa thông tin"</string>
<string name="edit_info" msgid="5973929805855224805">"Chỉnh sửa thông tin khẩn cấp"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Thông tin"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Liên hệ"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Hủy"</string>
<string name="ok" msgid="163967937451981024">"OK"</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="user_emergency_info_title" msgid="7827058167207376581">"Thông tin khẩn cấp"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Thông tin bạn nhập ở đây có thể giúp người trả lời đầu tiên trong trường hợp khẩn cấp. Thông tin này chỉ được lưu trữ trên thiết bị của bạn nhưng bất cứ ai đều có thể đọc được từ trình quay số khẩn cấp mà không cần mở khóa điện thoại của bạn."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Tiếp tục"</string>
<string name="no_info_provided" msgid="716200382010821001">"Không có thông tin nào về chủ sở hữu điện thoại"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Nếu đây là điện thoại của bạn, hãy nhấn vào biểu tượng bút chì để thêm thông tin sẽ được hiển thị tại đây trong trường hợp khẩn cấp"</string>
<string name="clear_all" msgid="8899013032870561633">"Xóa tất cả"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ceb29ea..3807ae0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"信息"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"联系人"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"取消"</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="user_emergency_info_title" msgid="7827058167207376581">"急救信息"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"您在此处输入的信息可协助第一线救援人员在发生紧急事件时提供相关援助。系统只会将这项信息存储在您的设备上,但任何人都能在您的手机未解锁的情况下通过紧急呼救拨号器看到此信息。"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"继续"</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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c0d03e9..4e8d795 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"資訊"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"聯絡人"</string>
@@ -69,13 +71,13 @@
<string name="ab_positive" msgid="1931300033534642005">"AB 正型"</string>
<string name="ab_negative" msgid="2064555613093591729">"AB 負型"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
- <string name="allergies" msgid="2789200777539258165">"過敏症"</string>
+ <string name="allergies" msgid="2789200777539258165">"過敏"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"不明"</string>
<string name="allergies_hint" msgid="5488918780522184147">"例如花生"</string>
<string name="medications" msgid="644428945685557183">"服用中藥物"</string>
<string name="unknown_medications" msgid="2764171064510423734">"不明"</string>
<string name="medications_hint" msgid="3221620025945593723">"例如阿士匹靈"</string>
- <string name="medical_conditions" msgid="3555690011498283592">"醫療事項"</string>
+ <string name="medical_conditions" msgid="3555690011498283592">"醫療注意事項"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"不明"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"例如哮喘"</string>
<string name="organ_donor" msgid="5953509460007124827">"器官捐贈者"</string>
@@ -96,11 +98,8 @@
<string name="cancel" msgid="7401575239009060939">"取消"</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="user_emergency_info_title" msgid="7827058167207376581">"緊急資料"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"您在此輸入的資料將有助急救員處理緊急情況。雖然這些資料只會儲存在您的裝置中,但任何人士無需將手機解鎖也可從緊急撥號器看到。"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"繼續"</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f684940..7368e40 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,6 +17,8 @@
<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="tab_title_info" msgid="1402033103294855812">"資訊"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"聯絡人"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"取消"</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="user_emergency_info_title" msgid="7827058167207376581">"緊急資訊"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"您在這裡輸入的資訊可協助第一線處理人員在發生緊急事件時提供相關協助。這項資訊只會儲存在您的裝置上;任何人都能透過緊急撥號器讀取這項資訊,而不需將手機解鎖。"</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"繼續"</string>
<string name="no_info_provided" msgid="716200382010821001">"沒有任何關於手機擁有者的資訊"</string>
<string name="tap_pencil" msgid="2723698054265296934">"如果這是你的手機,輕觸鉛筆圖示就能新增緊急救援資訊並顯示在這裡,以備不時之需"</string>
<string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0ec88e2..9bd6a45 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -17,6 +17,8 @@
<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">"Ulwazi lwesimo esiphuthumayo"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Ulwazi lwezemithi"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"Hlela ulwazi"</string>
<string name="edit_info" msgid="5973929805855224805">"Hlela ulwazi lwesimo esiphuthumayo"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Ulwazi"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Oxhumana nabo"</string>
@@ -96,9 +98,6 @@
<string name="cancel" msgid="7401575239009060939">"Khansela"</string>
<string name="ok" msgid="163967937451981024">"KULUNGILE"</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="user_emergency_info_title" msgid="7827058167207376581">"Ulwazi lwesimo esiphuthumayo"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Ulwazi olufakayo lapha lingasiza abaphenduli bokuqala esimweni esiphuthumayo. Lulodolozwe kudivayisi yakho kuphela, futhi nomba ubani angalufunda kusuka kokudayila kwesimo esiphuthumayo ngaphandle kokuvula ifoni yakho."</string>
- <string name="emergency_info_continue" msgid="5453201508537906087">"Qhubeka"</string>
<string name="no_info_provided" msgid="716200382010821001">"Alukho ulwazi mayelana nomnikazi wefoni"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Uma le kuyifoni yakho, thepha isithonjana sepensela ukuze ungeze ulwazi oluzoboniswa lapha esimeni sokuphuthumayo"</string>
<string name="clear_all" msgid="8899013032870561633">"Sula konke"</string>
diff --git a/res/layout/edit_activity_layout.xml b/res/values/config.xml
similarity index 62%
rename from res/layout/edit_activity_layout.xml
rename to res/values/config.xml
index ce9ca98..54792d2 100644
--- a/res/layout/edit_activity_layout.xml
+++ b/res/values/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2017 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.
@@ -13,10 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
- <include layout="@layout/custom_action_bar"/>
- <include layout="@layout/tabs"/>
-</LinearLayout>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
+ <string name="config_featureFactory" translatable="false">com.android.emergency.overlay.FeatureFactoryImpl</string>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 00eb7da..324177d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,6 +16,10 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The name of the app. [CHAR_LIMIT=30] -->
<string name="app_label">Emergency information</string>
+ <!-- The title of the medical information preferences category -->
+ <string name="medical_info_title">Medical information</string>
+ <!-- The title of the action to edit the medical information preferences -->
+ <string name="edit_medical_info">Edit information</string>
<!-- The description of the pencil icon, for talkback. [CHAR_LIMIT=NONE] -->
<string name="edit_info">Edit emergency information</string>
<!-- The title of the emergency info tab. [CHAR_LIMIT=15] -->
@@ -197,12 +201,6 @@
<string name="phone_type_and_phone_number">
<xliff:g id="phone_type" example="Mobile">%1$s</xliff:g> • <xliff:g id="phone_number" example="333-444-5566">%2$s</xliff:g>
</string>
- <!-- Title of dialog shown to the user to confirm that he understands that emergency information is shown in emergency dialer [CHAR LIMIT=30] -->
- <string name="user_emergency_info_title">Emergency information</string>
- <!-- Message of dialog shown to user to confirm that he understands that emergency information is shown in emergency dialer [CHAR LIMIT=none] -->
- <string name="user_emergency_info_consent">Information you enter here can help first responders in an emergency. It is stored on your device only, and anyone can read it from the emergency dialer without unlocking your phone.</string>
- <!-- Label for button in confirmation dialog when the user clicks on emergency information [CHAR LIMIT=15] -->
- <string name="emergency_info_continue">Continue</string>
<!-- Message shown when no emergency information has been provided by the user [CHAR LIMIT=NONE] -->
<string name="no_info_provided">No information about the phone\'s owner</string>
<!-- Extra message to indicate to the user that they can add emergency information [CHAR LIMIT=NONE] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3a38c8c..f4c48ce 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
<resources>
- <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
- <item name="android:preferenceCategoryStyle">@style/AppTheme.PreferenceCategoryStyle</item>
+ <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="colorPrimaryDark">@color/primary_dark_color</item>
<item name="android:windowLightStatusBar">true</item>
<item name="tabIndicatorColor">@color/accent_color_dark</item>
diff --git a/res/xml/edit_emergency_contacts.xml b/res/xml/edit_emergency_contacts.xml
deleted file mode 100644
index 8130533..0000000
--- a/res/xml/edit_emergency_contacts.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.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <com.android.emergency.preferences.EmergencyContactsPreference
- android:key="emergency_contacts"
- android:title="@string/emergency_contacts_title" />
- <Preference
- android:icon="@drawable/ic_add_24dp"
- android:key="add_contact"
- android:persistent="false"
- android:title="@string/add_emergency_contact" />
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index 2cb8ca7..5f4ff73 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2017 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.
@@ -13,77 +13,96 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <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" />
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/app_label">
+ <PreferenceCategory
+ android:key="medical_info"
+ android:title="@string/medical_info_title">
+ <com.android.emergency.preferences.NameAutoCompletePreference
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_account_circle"
+ android:inputType="textCapWords|textPersonName"
+ android:key="name"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:singleLine="true"
+ android:title="@string/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" />
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_address_black_24dp"
+ android:key="address"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:title="@string/address" />
- <com.android.emergency.preferences.EmergencyListPreference
- xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
- android:defaultValue=""
- android:entries="@array/blood_type_entries"
- android:entryValues="@array/blood_type_values"
- android:icon="@drawable/ic_bloodtype_black_24dp"
- 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" />
+ <com.android.emergency.preferences.EmergencyListPreference
+ xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_bloodtype_black_24dp"
+ android:entries="@array/blood_type_entries"
+ android:entryValues="@array/blood_type_values"
+ android:key="blood_type"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:title="@string/blood_type"
+ app:entryContentDescriptions="@array/blood_type_content_description" />
- <com.android.emergency.preferences.EmergencyEditTextPreference
- android:capitalize="sentences"
- android:hint="@string/allergies_hint"
- android:textColorHint="@color/hint_text_color"
- android:icon="@drawable/ic_allergies_black_24dp"
- android:inputType="textMultiLine"
- android:key="allergies"
- android:singleLine="false"
- android:summary="@string/unknown_allergies"
- android:title="@string/allergies" />
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_allergies_black_24dp"
+ android:key="allergies"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:title="@string/allergies" />
- <com.android.emergency.preferences.EmergencyEditTextPreference
- android:capitalize="sentences"
- android:hint="@string/medications_hint"
- android:textColorHint="@color/hint_text_color"
- android:icon="@drawable/ic_medication_24dp"
- android:inputType="textMultiLine"
- android:key="medications"
- android:singleLine="false"
- android:summary="@string/unknown_medications"
- android:title="@string/medications" />
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_medication_24dp"
+ android:key="medications"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:title="@string/medications" />
- <com.android.emergency.preferences.EmergencyListPreference
- android:entries="@array/organ_donor_entries"
- android:entryValues="@array/organ_donor_values"
- android:icon="@drawable/ic_heart_black_24dp"
- android:key="organ_donor"
- android:defaultValue=""
- android:negativeButtonText="@null"
- android:positiveButtonText="@null"
- android:summary="@string/unknown_organ_donor"
- android:title="@string/organ_donor" />
+ <com.android.emergency.preferences.EmergencyListPreference
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_heart_black_24dp"
+ android:entries="@array/organ_donor_entries"
+ android:entryValues="@array/organ_donor_values"
+ android:key="organ_donor"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:title="@string/organ_donor" />
- <com.android.emergency.preferences.EmergencyEditTextPreference
- android:capitalize="sentences"
- android:hint="@string/medical_conditions_hint"
- android:textColorHint="@color/hint_text_color"
- android:icon="@drawable/ic_notes_black_24dp"
- android:inputType="textMultiLine"
- android:key="medical_conditions"
- android:singleLine="false"
- android:summary="@string/unknown_medical_conditions"
- android:title="@string/medical_conditions" />
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:enabled="false"
+ android:focusable="true"
+ android:icon="@drawable/ic_notes_black_24dp"
+ android:key="medical_conditions"
+ android:selectable="false"
+ android:shouldDisableView="false"
+ android:title="@string/medical_conditions" />
+
+ <Preference
+ android:key="edit_medical_info"
+ android:icon="@drawable/ic_mode_edit_googblue_24dp"
+ android:title="@string/edit_medical_info">
+ <intent android:action="android.emergency.EDIT_MEDICAL_INFO"/>
+ </Preference>
+ </PreferenceCategory>
+
+ <com.android.emergency.preferences.EmergencyContactsPreference
+ android:key="emergency_contacts"
+ android:title="@string/emergency_contacts_title"/>
+ <Preference
+ android:key="add_emergency_contact"
+ android:icon="@drawable/ic_add_24dp"
+ android:title="@string/add_emergency_contact"/>
</PreferenceScreen>
diff --git a/res/xml/edit_medical_info.xml b/res/xml/edit_medical_info.xml
new file mode 100644
index 0000000..e1603fc
--- /dev/null
+++ b/res/xml/edit_medical_info.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <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" />
+
+ <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" />
+
+ <com.android.emergency.preferences.EmergencyListPreference
+ xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
+ android:defaultValue=""
+ android:entries="@array/blood_type_entries"
+ android:entryValues="@array/blood_type_values"
+ android:icon="@drawable/ic_bloodtype_black_24dp"
+ 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" />
+
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:capitalize="sentences"
+ android:hint="@string/allergies_hint"
+ android:textColorHint="@color/hint_text_color"
+ android:icon="@drawable/ic_allergies_black_24dp"
+ android:inputType="textMultiLine"
+ android:key="allergies"
+ android:singleLine="false"
+ android:summary="@string/unknown_allergies"
+ android:title="@string/allergies" />
+
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:capitalize="sentences"
+ android:hint="@string/medications_hint"
+ android:textColorHint="@color/hint_text_color"
+ android:icon="@drawable/ic_medication_24dp"
+ android:inputType="textMultiLine"
+ android:key="medications"
+ android:singleLine="false"
+ android:summary="@string/unknown_medications"
+ android:title="@string/medications" />
+
+ <com.android.emergency.preferences.EmergencyListPreference
+ android:entries="@array/organ_donor_entries"
+ android:entryValues="@array/organ_donor_values"
+ android:icon="@drawable/ic_heart_black_24dp"
+ android:key="organ_donor"
+ android:defaultValue=""
+ android:negativeButtonText="@null"
+ android:positiveButtonText="@null"
+ android:summary="@string/unknown_organ_donor"
+ android:title="@string/organ_donor" />
+
+ <com.android.emergency.preferences.EmergencyEditTextPreference
+ android:capitalize="sentences"
+ android:hint="@string/medical_conditions_hint"
+ android:textColorHint="@color/hint_text_color"
+ android:icon="@drawable/ic_notes_black_24dp"
+ android:inputType="textMultiLine"
+ android:key="medical_conditions"
+ android:singleLine="false"
+ android:summary="@string/unknown_medical_conditions"
+ android:title="@string/medical_conditions" />
+</PreferenceScreen>
diff --git a/src/com/android/emergency/EmergencyTabActivity.java b/src/com/android/emergency/EmergencyTabActivity.java
deleted file mode 100644
index 3ca6c36..0000000
--- a/src/com/android/emergency/EmergencyTabActivity.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * 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.
- */
-package com.android.emergency;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.res.Configuration;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.VisibleForTesting;
-import android.support.design.widget.TabLayout;
-import android.support.design.widget.TabLayout.TabLayoutOnPageChangeListener;
-import android.support.design.widget.TabLayout.ViewPagerOnTabSelectedListener;
-import android.support.v13.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.Pair;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toolbar;
-
-import java.util.ArrayList;
-/**
- * An activity uses a tab layout to separate personal and medical information
- * from emergency contacts.
- */
-public abstract class EmergencyTabActivity extends Activity {
- private ViewPagerAdapter mTabsAdapter;
- private TabLayout mTabLayout;
- private Menu mMenu;
-
- private ArrayList<Pair<String, Fragment>> mFragments;
-
- @Override
- protected void onResume() {
- super.onResume();
- int display_mode = getResources().getConfiguration().orientation;
-
- if (display_mode == Configuration.ORIENTATION_PORTRAIT) {
- mTabLayout.setTabMode(TabLayout.MODE_FIXED);
- mTabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
- }
- }
-
- @VisibleForTesting
- public Menu getMenu() {
- return mMenu;
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- mMenu = menu;
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- // Respond to the action bar's Up/Home button.
- case android.R.id.home:
- onBackPressed();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- /** Returns the index of the currently selected tab. */
- @VisibleForTesting
- public int getSelectedTabPosition() {
- return mTabLayout.getSelectedTabPosition();
- }
-
- @Override
- public void setContentView(@LayoutRes int layoutResID) {
- super.setContentView(layoutResID);
- setupTabs();
- Toolbar toolbar = (Toolbar) findViewById(R.id.action_bar);
- setActionBar(toolbar);
- getActionBar().setDisplayHomeAsUpEnabled(true);
- }
-
- /** Selects the tab at index {@code selectedTabIndex}. */
- public void selectTab(int selectedTabIndex) {
- if (mTabLayout != null && selectedTabIndex >= 0 &&
- selectedTabIndex < mTabLayout.getTabCount()) {
- mTabLayout.getTabAt(selectedTabIndex).select();
- }
- }
-
- protected void setupTabs() {
- mFragments = setUpFragments();
- mTabLayout = (TabLayout) findViewById(R.id.sliding_tabs);
- if (mTabsAdapter == null) {
- // The viewpager that will host the section contents.
- ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
- mTabsAdapter = new ViewPagerAdapter(getFragmentManager());
- viewPager.setAdapter(mTabsAdapter);
- mTabLayout.setTabsFromPagerAdapter(mTabsAdapter);
-
- // Set a listener via setOnTabSelectedListener(OnTabSelectedListener) to be notified
- // when any tab's selection state has been changed.
- mTabLayout.setOnTabSelectedListener(
- new TabLayout.ViewPagerOnTabSelectedListener(viewPager));
-
- // Use a TabLayout.TabLayoutOnPageChangeListener to forward the scroll and selection
- // changes to this layout
- viewPager.addOnPageChangeListener(new TabLayoutOnPageChangeListener(mTabLayout));
- } else {
- mTabsAdapter.notifyDataSetChanged();
- mTabLayout.setTabsFromPagerAdapter(mTabsAdapter);
- }
- }
-
- public TabLayout getTabLayout() {
- return mTabLayout;
- }
-
- /** Return the fragments. */
- @VisibleForTesting
- public ArrayList<Pair<String, Fragment>> getFragments() {
- return mFragments;
- }
-
- /** Return number of fragments to show in the tabs. */
- public int getNumberFragments() {
- return mFragments.size();
- }
-
- /** Return the adapter. */
- protected ViewPagerAdapter getTabsAdapter() {
- return mTabsAdapter;
- }
-
- /** Returns the fragments to show in the tabs. */
- protected abstract ArrayList<Pair<String, Fragment>> setUpFragments();
-
- /** The adapter used to handle the two fragments. */
- protected class ViewPagerAdapter extends FragmentStatePagerAdapter {
- public ViewPagerAdapter(FragmentManager fm) {
- super(fm);
- }
-
- @Override
- public Fragment getItem(int position) {
- return mFragments.get(position).second;
- }
-
- @Override
- public int getCount() {
- return mFragments.size();
- }
-
- @Override
- public CharSequence getPageTitle(int position) {
- return mFragments.get(position).first;
- }
-
- @Override
- public int getItemPosition(Object object) {
- // The default implementation assumes that items will never change position and always
- // returns POSITION_UNCHANGED. This is how you can specify that the positions can change
- return FragmentStatePagerAdapter.POSITION_NONE;
- }
- }
-}
diff --git a/src/com/android/emergency/PreferenceKeys.java b/src/com/android/emergency/PreferenceKeys.java
index 0592281..89db2a6 100644
--- a/src/com/android/emergency/PreferenceKeys.java
+++ b/src/com/android/emergency/PreferenceKeys.java
@@ -20,11 +20,17 @@
*/
public interface PreferenceKeys {
+ /** Key for the medical info preference category in the edit screen. */
+ public static final String KEY_MEDICAL_INFO = "medical_info";
+
+ /** Key for the medical info preference */
+ public static final String KEY_EDIT_MEDICAL_INFO = "edit_medical_info";
+
/** Key for emergency contacts preference */
public static final String KEY_EMERGENCY_CONTACTS = "emergency_contacts";
- /** Key for the add contact preference */
- public static final String KEY_ADD_CONTACT = "add_contact";
+ /** Key for the add emergency contact preference */
+ public static final String KEY_ADD_EMERGENCY_CONTACT = "add_emergency_contact";
/** Key to store and read the name of the user. */
public static final String KEY_NAME = "name";
diff --git a/src/com/android/emergency/edit/EditInfoActivity.java b/src/com/android/emergency/edit/EditInfoActivity.java
index fb26e94..2ac34de 100644
--- a/src/com/android/emergency/edit/EditInfoActivity.java
+++ b/src/com/android/emergency/edit/EditInfoActivity.java
@@ -17,6 +17,7 @@
import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
@@ -26,16 +27,18 @@
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.util.Pair;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import com.android.emergency.EmergencyTabActivity;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
+import com.android.emergency.overlay.FeatureFactory;
import com.android.emergency.view.ViewInfoActivity;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -44,13 +47,10 @@
/**
* Activity for editing emergency information.
*/
-public class EditInfoActivity extends EmergencyTabActivity {
- static final String TAG_WARNING_DIALOG = "warning_dialog";
+public class EditInfoActivity extends Activity {
static final String TAG_CLEAR_ALL_DIALOG = "clear_all_dialog";
- static final String KEY_LAST_CONSENT_TIME_MS = "last_consent_time_ms";
- static final long ONE_DAY_MS = 24 * 60 * 60 * 1000;
- private static final String ACTION_EDIT_EMERGENCY_CONTACTS =
- "android.emergency.EDIT_EMERGENCY_CONTACTS";
+
+ private EditInfoFragment mEditInfoFragment;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -62,39 +62,33 @@
pm.setComponentEnabledSetting(new ComponentName(this, ViewInfoActivity.class),
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, PackageManager.DONT_KILL_APP);
- setContentView(R.layout.edit_activity_layout);
- if (ACTION_EDIT_EMERGENCY_CONTACTS.equals(getIntent().getAction())) {
- // Select emergency contacts tab
- selectTab(1);
- }
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+
+ mEditInfoFragment = new EditInfoFragment();
+ getFragmentManager().beginTransaction()
+ .replace(android.R.id.content, mEditInfoFragment)
+ .commit();
getWindow().addFlags(FLAG_DISMISS_KEYGUARD);
MetricsLogger.visible(this, MetricsEvent.ACTION_EDIT_EMERGENCY_INFO);
}
@Override
- public void onResume() {
- super.onResume();
- long lastConsentTimeMs = PreferenceManager.getDefaultSharedPreferences(this)
- .getLong(KEY_LAST_CONSENT_TIME_MS, Long.MAX_VALUE);
- long nowMs = System.currentTimeMillis();
- // Check if at least one day has gone by since the user last gave his constant or if
- // the last consent was in the future (e.g. if the user changed the date).
- if (nowMs - lastConsentTimeMs > ONE_DAY_MS || lastConsentTimeMs > nowMs) {
- showWarningDialog();
- }
- }
-
- @Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.edit_info_menu, menu);
- return super.onCreateOptionsMenu(menu);
+ return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ case android.R.id.home:
+ // The user asked to navigate up, which, in this case, can easily be accomplished
+ // by finishing the activity.
+ finish();
+ return true;
+
case R.id.action_clear_all:
showClearAllDialog();
return true;
@@ -102,27 +96,10 @@
return super.onOptionsItemSelected(item);
}
- @Override
- protected ArrayList<Pair<String, Fragment>> setUpFragments() {
- // Always return the two fragments in edit mode.
- ArrayList<Pair<String, Fragment>> fragments = new ArrayList<>(2);
- fragments.add(Pair.create(getResources().getString(R.string.tab_title_info),
- EditEmergencyInfoFragment.newInstance()));
- fragments.add(Pair.create(getResources().getString(R.string.tab_title_contacts),
- EditEmergencyContactsFragment.newInstance()));
- return fragments;
- }
-
- private void showWarningDialog() {
- final WarningDialogFragment previousFragment =
- (WarningDialogFragment) getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
-
- if (previousFragment == null) {
- DialogFragment newFragment = WarningDialogFragment.newInstance();
- newFragment.setCancelable(false);
- newFragment.show(getFragmentManager(), TAG_WARNING_DIALOG);
- }
+ /** @return The single fragment managed by this activity. */
+ @VisibleForTesting
+ public PreferenceFragment getFragment() {
+ return mEditInfoFragment;
}
private void showClearAllDialog() {
@@ -143,47 +120,7 @@
sharedPreferences.edit().remove(PreferenceKeys.KEY_EMERGENCY_CONTACTS).commit();
// Refresh the UI.
- ViewPagerAdapter adapter = getTabsAdapter();
- if (adapter != null) {
- adapter.notifyDataSetChanged();
- }
- }
-
- /**
- * Warning dialog shown to the user each time they go in to the edit info view. Using a {@link
- * DialogFragment} takes care of screen rotation issues.
- */
- public static class WarningDialogFragment extends DialogFragment {
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- Dialog dialog = new AlertDialog.Builder(getActivity())
- .setTitle(R.string.user_emergency_info_title)
- .setMessage(R.string.user_emergency_info_consent)
- .setPositiveButton(R.string.emergency_info_continue,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- PreferenceManager.getDefaultSharedPreferences(
- getActivity()).edit()
- .putLong(KEY_LAST_CONSENT_TIME_MS,
- System.currentTimeMillis()).apply();
- }
- })
- .setNegativeButton(android.R.string.cancel,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- getActivity().finish();
- }
- })
- .create();
- dialog.setCanceledOnTouchOutside(false);
- return dialog;
- }
-
- public static DialogFragment newInstance() {
- return new WarningDialogFragment();
- }
+ mEditInfoFragment.reloadFromPreference();
}
/**
diff --git a/src/com/android/emergency/edit/EditEmergencyContactsFragment.java b/src/com/android/emergency/edit/EditInfoFragment.java
similarity index 63%
rename from src/com/android/emergency/edit/EditEmergencyContactsFragment.java
rename to src/com/android/emergency/edit/EditInfoFragment.java
index 85ded96..1fce209 100644
--- a/src/com/android/emergency/edit/EditEmergencyContactsFragment.java
+++ b/src/com/android/emergency/edit/EditInfoFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -16,43 +16,56 @@
package com.android.emergency.edit;
import android.app.Activity;
-import android.app.Fragment;
import android.content.ActivityNotFoundException;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceManager;
import android.provider.ContactsContract;
import android.util.Log;
import android.widget.Toast;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
+import com.android.emergency.ReloadablePreferenceInterface;
import com.android.emergency.preferences.EmergencyContactsPreference;
+import com.android.internal.annotations.VisibleForTesting;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
-/**
- * Fragment that displays emergency contacts. These contacts can be added or removed.
- */
-public class EditEmergencyContactsFragment extends PreferenceFragment {
- private static final String TAG = "EditEmergencyContactsFragment";
+/** Fragment for editing emergency info, including medical info and emergency contacts. */
+public class EditInfoFragment extends PreferenceFragment {
+ private static final String TAG = "EditInfoFragment";
/** Result code for contact picker */
private static final int CONTACT_PICKER_RESULT = 1001;
+ private final Map<String, Preference> mMedicalInfoPreferences =
+ new HashMap<String, Preference>();
+
/** The category that holds the emergency contacts. */
private EmergencyContactsPreference mEmergencyContactsPreferenceCategory;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.edit_emergency_contacts);
+ addPreferencesFromResource(R.xml.edit_emergency_info);
+
+ for (String preferenceKey : PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO) {
+ Preference preference = findPreference(preferenceKey);
+ mMedicalInfoPreferences.put(preferenceKey, preference);
+ }
+
+ // Fill in emergency contacts.
mEmergencyContactsPreferenceCategory = (EmergencyContactsPreference)
findPreference(PreferenceKeys.KEY_EMERGENCY_CONTACTS);
- Preference addEmergencyContact = findPreference(PreferenceKeys.KEY_ADD_CONTACT);
+ Preference addEmergencyContact = findPreference(PreferenceKeys.KEY_ADD_EMERGENCY_CONTACT);
addEmergencyContact.setOnPreferenceClickListener(new Preference
.OnPreferenceClickListener() {
@Override
@@ -74,7 +87,6 @@
}
}
});
-
}
@Override
@@ -85,9 +97,18 @@
/** Reloads the contacts by reading the value from the shared preferences. */
public void reloadFromPreference() {
- if (mEmergencyContactsPreferenceCategory != null) {
- mEmergencyContactsPreferenceCategory.reloadFromPreference();
+ for (Preference preference : mMedicalInfoPreferences.values()) {
+ ReloadablePreferenceInterface reloadablePreference =
+ (ReloadablePreferenceInterface) preference;
+ reloadablePreference.reloadFromPreference();
+ if (reloadablePreference.isNotSet()) {
+ getMedicalInfoParent().removePreference(preference);
+ } else {
+ // Note: this preference won't be added it if it already exists.
+ getMedicalInfoParent().addPreference(preference);
+ }
}
+ mEmergencyContactsPreferenceCategory.reloadFromPreference();
}
@Override
@@ -98,7 +119,13 @@
}
}
- public static Fragment newInstance() {
- return new EditEmergencyContactsFragment();
+ @VisibleForTesting
+ public PreferenceGroup getMedicalInfoParent() {
+ return (PreferenceGroup) findPreference(PreferenceKeys.KEY_MEDICAL_INFO);
+ }
+
+ @VisibleForTesting
+ public Preference getMedicalInfoPreference(String key) {
+ return mMedicalInfoPreferences.get(key);
}
}
diff --git a/src/com/android/emergency/edit/EditMedicalInfoActivity.java b/src/com/android/emergency/edit/EditMedicalInfoActivity.java
new file mode 100644
index 0000000..fc2686d
--- /dev/null
+++ b/src/com/android/emergency/edit/EditMedicalInfoActivity.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+package com.android.emergency.edit;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+/** Activity for editing medical information. */
+public class EditMedicalInfoActivity extends Activity {
+ private EditMedicalInfoFragment mEditInfoFragment;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mEditInfoFragment = new EditMedicalInfoFragment();
+ getFragmentManager().beginTransaction()
+ .replace(android.R.id.content, mEditInfoFragment)
+ .commit();
+ }
+
+ @VisibleForTesting
+ public EditMedicalInfoFragment getFragment() {
+ return mEditInfoFragment;
+ }
+}
diff --git a/src/com/android/emergency/edit/EditEmergencyInfoFragment.java b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
similarity index 94%
rename from src/com/android/emergency/edit/EditEmergencyInfoFragment.java
rename to src/com/android/emergency/edit/EditMedicalInfoFragment.java
index 1265be0..78d2cc6 100644
--- a/src/com/android/emergency/edit/EditEmergencyInfoFragment.java
+++ b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
@@ -30,12 +30,12 @@
/**
* Fragment that displays personal and medical information.
*/
-public class EditEmergencyInfoFragment extends PreferenceFragment {
+public class EditMedicalInfoFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.edit_emergency_info);
+ addPreferencesFromResource(R.xml.edit_medical_info);
for (int i = 0; i < PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO.length; i++) {
final int index = i;
@@ -75,6 +75,6 @@
}
public static Fragment newInstance() {
- return new EditEmergencyInfoFragment();
+ return new EditMedicalInfoFragment();
}
}
diff --git a/src/com/android/emergency/edit/EmergencyContactsFeatureProvider.java b/src/com/android/emergency/edit/EmergencyContactsFeatureProvider.java
new file mode 100644
index 0000000..10a48b5
--- /dev/null
+++ b/src/com/android/emergency/edit/EmergencyContactsFeatureProvider.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+package com.android.emergency.edit;
+
+import android.app.Fragment;
+
+/** Feature provider for Emergency Contacts. */
+public interface EmergencyContactsFeatureProvider {
+}
diff --git a/src/com/android/emergency/edit/EmergencyContactsFeatureProviderImpl.java b/src/com/android/emergency/edit/EmergencyContactsFeatureProviderImpl.java
new file mode 100644
index 0000000..e0e7172
--- /dev/null
+++ b/src/com/android/emergency/edit/EmergencyContactsFeatureProviderImpl.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+package com.android.emergency.edit;
+
+import android.app.Fragment;
+
+/** AOSP implementation of Emergency Contacts data source. */
+public class EmergencyContactsFeatureProviderImpl implements EmergencyContactsFeatureProvider {
+}
diff --git a/src/com/android/emergency/overlay/FeatureFactory.java b/src/com/android/emergency/overlay/FeatureFactory.java
new file mode 100644
index 0000000..1e86d0d
--- /dev/null
+++ b/src/com/android/emergency/overlay/FeatureFactory.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+package com.android.emergency.overlay;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.emergency.edit.EmergencyContactsFeatureProvider;
+import com.android.emergency.R;
+
+/**
+ * Abstract class for creating feature controllers. Allows OEM implementations to define their own
+ * factories with their own controllers containing whatever code is needed to implement the
+ * features. To provide a factory implementation, implementers should override
+ * {@link R.string#config_featureFactory} in their override.
+ */
+public abstract class FeatureFactory {
+ private static final String LOG_TAG = "FeatureFactory";
+ private static final boolean DEBUG = false;
+
+ protected static FeatureFactory sFactory;
+
+ /** @return a singleton factory instance. */
+ public static FeatureFactory getFactory(Context context) {
+ if (sFactory != null) {
+ return sFactory;
+ }
+
+ if (DEBUG) Log.d(LOG_TAG, "getFactory");
+ final String clsName = context.getString(R.string.config_featureFactory);
+ if (TextUtils.isEmpty(clsName)) {
+ throw new UnsupportedOperationException("No feature factory configured");
+ }
+ try {
+ sFactory = (FeatureFactory) context.getClassLoader().loadClass(clsName).newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+ throw new FactoryNotFoundException(e);
+ }
+
+ if (DEBUG) Log.d(LOG_TAG, "started " + sFactory.getClass().getSimpleName());
+ return sFactory;
+ }
+
+ public abstract EmergencyContactsFeatureProvider getEmergencyContactsFeatureProvider();
+
+ /** Exception thrown when a factory can't be created. */
+ public static final class FactoryNotFoundException extends RuntimeException {
+ /**
+ * @param throwable The underlying cause for this exception.
+ */
+ public FactoryNotFoundException(Throwable throwable) {
+ super("Unable to create factory. Did you misconfigure Proguard?", throwable);
+ }
+ }
+}
diff --git a/src/com/android/emergency/overlay/FeatureFactoryImpl.java b/src/com/android/emergency/overlay/FeatureFactoryImpl.java
new file mode 100644
index 0000000..d25fd59
--- /dev/null
+++ b/src/com/android/emergency/overlay/FeatureFactoryImpl.java
@@ -0,0 +1,24 @@
+package com.android.emergency.overlay;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Keep;
+
+import com.android.emergency.edit.EmergencyContactsFeatureProvider;
+import com.android.emergency.edit.EmergencyContactsFeatureProviderImpl;
+
+/**
+ * {@link FeatureFactory} implementation for AOSP Emergency Info.
+ */
+@Keep
+public class FeatureFactoryImpl extends FeatureFactory {
+ protected EmergencyContactsFeatureProvider mEmergencyContactsFeatureProvider;
+
+ @Override
+ public EmergencyContactsFeatureProvider getEmergencyContactsFeatureProvider() {
+ if (mEmergencyContactsFeatureProvider == null) {
+ mEmergencyContactsFeatureProvider = new EmergencyContactsFeatureProviderImpl();
+ }
+ return mEmergencyContactsFeatureProvider;
+ }
+}
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index 3b0a7d8..e96d53c 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -15,12 +15,19 @@
*/
package com.android.emergency.view;
+import android.app.Activity;
import android.app.Fragment;
+import android.app.FragmentManager;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.annotation.LayoutRes;
import android.support.design.widget.TabLayout;
+import android.support.design.widget.TabLayout.TabLayoutOnPageChangeListener;
+import android.support.design.widget.TabLayout.ViewPagerOnTabSelectedListener;
+import android.support.v13.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.util.Pair;
import android.view.Menu;
@@ -30,12 +37,13 @@
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.TextView;
+import android.widget.Toolbar;
import android.widget.ViewFlipper;
-import com.android.emergency.EmergencyTabActivity;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
import com.android.emergency.edit.EditInfoActivity;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -44,12 +52,24 @@
/**
* Activity for viewing emergency information.
*/
-public class ViewInfoActivity extends EmergencyTabActivity {
+public class ViewInfoActivity extends Activity {
private TextView mPersonalCardLargeItem;
private SharedPreferences mSharedPreferences;
private LinearLayout mPersonalCard;
private ViewFlipper mViewFlipper;
+ private ViewPagerAdapter mTabsAdapter;
+ private TabLayout mTabLayout;
+ private ArrayList<Pair<String, Fragment>> mFragments;
+ private Menu mMenu;
+ @Override
+ public void setContentView(@LayoutRes int layoutResID) {
+ super.setContentView(layoutResID);
+ setupTabs();
+ Toolbar toolbar = (Toolbar) findViewById(R.id.action_bar);
+ setActionBar(toolbar);
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -86,15 +106,15 @@
private void maybeHideTabs() {
// Show a TextView with "No information provided" if there are no fragments.
- if (getNumberFragments() == 0) {
+ if (mFragments.size() == 0) {
mViewFlipper.setDisplayedChild(
mViewFlipper.indexOfChild(findViewById(R.id.no_info)));
} else {
mViewFlipper.setDisplayedChild(mViewFlipper.indexOfChild(findViewById(R.id.tabs)));
}
- TabLayout tabLayout = getTabLayout();
- if (getNumberFragments() <= 1) {
+ TabLayout tabLayout = mTabLayout;
+ if (mFragments.size() <= 1) {
tabLayout.setVisibility(View.GONE);
} else {
tabLayout.setVisibility(View.VISIBLE);
@@ -105,6 +125,7 @@
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.view_info_menu, menu);
+ mMenu = menu;
return super.onCreateOptionsMenu(menu);
}
@@ -120,8 +141,24 @@
return super.onOptionsItemSelected(item);
}
- @Override
- protected ArrayList<Pair<String, Fragment>> setUpFragments() {
+ /** Return the tab layout. */
+ @VisibleForTesting
+ public TabLayout getTabLayout() {
+ return mTabLayout;
+ }
+
+ @VisibleForTesting
+ public Menu getMenu() {
+ return mMenu;
+ }
+
+ /** Return the fragments. */
+ @VisibleForTesting
+ public ArrayList<Pair<String, Fragment>> getFragments() {
+ return mFragments;
+ }
+
+ private ArrayList<Pair<String, Fragment>> setUpFragments() {
// Return only the fragments that have at least one piece of information set:
ArrayList<Pair<String, Fragment>> fragments = new ArrayList<>(2);
@@ -135,4 +172,57 @@
}
return fragments;
}
+
+ private void setupTabs() {
+ mFragments = setUpFragments();
+ mTabLayout = (TabLayout) findViewById(R.id.sliding_tabs);
+ if (mTabsAdapter == null) {
+ // The viewpager that will host the section contents.
+ ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+ mTabsAdapter = new ViewPagerAdapter(getFragmentManager());
+ viewPager.setAdapter(mTabsAdapter);
+ mTabLayout.setTabsFromPagerAdapter(mTabsAdapter);
+
+ // Set a listener via setOnTabSelectedListener(OnTabSelectedListener) to be notified
+ // when any tab's selection state has been changed.
+ mTabLayout.setOnTabSelectedListener(
+ new TabLayout.ViewPagerOnTabSelectedListener(viewPager));
+
+ // Use a TabLayout.TabLayoutOnPageChangeListener to forward the scroll and selection
+ // changes to this layout
+ viewPager.addOnPageChangeListener(new TabLayoutOnPageChangeListener(mTabLayout));
+ } else {
+ mTabsAdapter.notifyDataSetChanged();
+ mTabLayout.setTabsFromPagerAdapter(mTabsAdapter);
+ }
+ }
+
+ /** The adapter used to handle the two fragments. */
+ protected class ViewPagerAdapter extends FragmentStatePagerAdapter {
+ public ViewPagerAdapter(FragmentManager fm) {
+ super(fm);
+ }
+
+ @Override
+ public Fragment getItem(int position) {
+ return mFragments.get(position).second;
+ }
+
+ @Override
+ public int getCount() {
+ return mFragments.size();
+ }
+
+ @Override
+ public CharSequence getPageTitle(int position) {
+ return mFragments.get(position).first;
+ }
+
+ @Override
+ public int getItemPosition(Object object) {
+ // The default implementation assumes that items will never change position and always
+ // returns POSITION_UNCHANGED. This is how you can specify that the positions can change
+ return FragmentStatePagerAdapter.POSITION_NONE;
+ }
+ }
}
diff --git a/tests/src/com/android/emergency/edit/EditEmergencyContactsFragmentTest.java b/tests/src/com/android/emergency/edit/EditEmergencyContactsFragmentTest.java
deleted file mode 100644
index 57008ba..0000000
--- a/tests/src/com/android/emergency/edit/EditEmergencyContactsFragmentTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- */
-package com.android.emergency.edit;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.preference.Preference;
-import android.provider.ContactsContract;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.emergency.PreferenceKeys;
-
-/**
- * Tests for {@link EditEmergencyContactsFragment}.
- */
-@MediumTest
-public class EditEmergencyContactsFragmentTest
- extends ActivityInstrumentationTestCase2<EditInfoActivity> {
- private EditEmergencyContactsFragment mEditEmergencyContactsFragment;
- private Preference mAddContactPreference;
-
- public EditEmergencyContactsFragmentTest() {
- super(EditInfoActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mEditEmergencyContactsFragment = (EditEmergencyContactsFragment)
- getActivity().getFragments().get(1).second;
- mAddContactPreference =
- mEditEmergencyContactsFragment.findPreference(PreferenceKeys.KEY_ADD_CONTACT);
- }
-
- public void testAddContactPreference() throws Throwable {
- assertNotNull(mAddContactPreference);
-
- IntentFilter intentFilter = new IntentFilter(Intent.ACTION_PICK);
- intentFilter.addDataType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE);
-
- Instrumentation.ActivityMonitor activityMonitor =
- getInstrumentation().addMonitor(intentFilter, null, true /* block */);
-
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mAddContactPreference
- .getOnPreferenceClickListener().onPreferenceClick(mAddContactPreference);
- }
- });
-
- assertEquals(true, getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */));
- }
-}
diff --git a/tests/src/com/android/emergency/edit/EditInfoActivityTest.java b/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
index 83df4b5..1d2d8cb 100644
--- a/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
+++ b/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
@@ -15,13 +15,24 @@
*/
package com.android.emergency.edit;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
import android.app.AlertDialog;
+import android.app.Dialog;
import android.app.Fragment;
+import android.app.Instrumentation;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.net.Uri;
import android.os.PowerManager;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
import android.preference.PreferenceManager;
+import android.provider.ContactsContract;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Pair;
@@ -42,9 +53,8 @@
*/
@LargeTest
public class EditInfoActivityTest extends ActivityInstrumentationTestCase2<EditInfoActivity> {
- private ArrayList<Pair<String, Fragment>> mFragments;
- private EditEmergencyInfoFragment mEditEmergencyInfoFragment;
- private EditEmergencyContactsFragment mEditEmergencyContactsFragment;
+ private EditInfoFragment mFragment;
+ private PreferenceGroup mMedicalInfoParent;
private PowerManager.WakeLock mKeepScreenOnWakeLock;
public EditInfoActivityTest() {
@@ -57,9 +67,8 @@
PreferenceManager.getDefaultSharedPreferences(getActivity()).edit().clear().commit();
forceScreenOn();
- mFragments = getActivity().getFragments();
- mEditEmergencyInfoFragment = (EditEmergencyInfoFragment) mFragments.get(0).second;
- mEditEmergencyContactsFragment = (EditEmergencyContactsFragment) mFragments.get(1).second;
+ mFragment = (EditInfoFragment) getActivity().getFragment();
+ mMedicalInfoParent = mFragment.getMedicalInfoParent();
}
@Override
@@ -69,50 +78,47 @@
super.tearDown();
}
- public void testTwoFragments() {
- assertEquals(2, mFragments.size());
- }
-
public void testInitialState() {
+ // Because the initial state of each preference is empty, the edit activity removes the
+ // preference. As a result, we expect them all to be null.
for (String key : PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO) {
- assertNotNull(mEditEmergencyInfoFragment.findPreference(key));
+ assertWithMessage(key).that(mMedicalInfoParent.findPreference(key)).isNull();
}
EmergencyContactsPreference emergencyContactsPreference =
- (EmergencyContactsPreference) mEditEmergencyContactsFragment
- .findPreference(PreferenceKeys.KEY_EMERGENCY_CONTACTS);
- assertNotNull(emergencyContactsPreference);
- assertEquals(0, emergencyContactsPreference.getPreferenceCount());
+ (EmergencyContactsPreference) mFragment.findPreference(
+ PreferenceKeys.KEY_EMERGENCY_CONTACTS);
+ assertThat(emergencyContactsPreference).isNotNull();
+ assertThat(emergencyContactsPreference.getPreferenceCount()).isEqualTo(0);
}
public void testClearAllPreferences () throws Throwable {
- EditInfoActivity editInfoActivity = getActivity();
final NameAutoCompletePreference namePreference =
- (NameAutoCompletePreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_NAME);
+ (NameAutoCompletePreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_NAME);
final EmergencyEditTextPreference addressPreference =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_ADDRESS);
+ (EmergencyEditTextPreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_ADDRESS);
final EmergencyListPreference bloodTypePreference =
- (EmergencyListPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_BLOOD_TYPE);
+ (EmergencyListPreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_BLOOD_TYPE);
final EmergencyEditTextPreference allergiesPreference =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_ALLERGIES);
+ (EmergencyEditTextPreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_ALLERGIES);
final EmergencyEditTextPreference medicationsPreference =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_MEDICATIONS);
+ (EmergencyEditTextPreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_MEDICATIONS);
final EmergencyEditTextPreference medicalConditionsPreference =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_MEDICAL_CONDITIONS);
+ (EmergencyEditTextPreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_MEDICAL_CONDITIONS);
final EmergencyListPreference organDonorPreference =
- (EmergencyListPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_ORGAN_DONOR);
+ (EmergencyListPreference) mFragment.getMedicalInfoPreference(
+ PreferenceKeys.KEY_ORGAN_DONOR);
final EmergencyContactsPreference emergencyContactsPreference =
- (EmergencyContactsPreference) mEditEmergencyContactsFragment
+ (EmergencyContactsPreference) mFragment
.findPreference(PreferenceKeys.KEY_EMERGENCY_CONTACTS);
final Uri contactUri = ContactTestUtils
- .createContact(editInfoActivity.getContentResolver(), "Michael", "789");
+ .createContact(getActivity().getContentResolver(), "Michael", "789");
final List<Uri> emergencyContacts = new ArrayList<>();
emergencyContacts.add(contactUri);
@@ -130,40 +136,44 @@
}
});
- String unknownName = editInfoActivity.getResources().getString(R.string.unknown_name);
- String unknownAddress = editInfoActivity.getResources().getString(R.string.unknown_address);
+ String unknownName = getActivity().getResources().getString(R.string.unknown_name);
+ String unknownAddress = getActivity().getResources().getString(R.string.unknown_address);
String unknownBloodType =
- editInfoActivity.getResources().getString(R.string.unknown_blood_type);
+ getActivity().getResources().getString(R.string.unknown_blood_type);
String unknownAllergies =
- editInfoActivity.getResources().getString(R.string.unknown_allergies);
+ getActivity().getResources().getString(R.string.unknown_allergies);
String unknownMedications =
- editInfoActivity.getResources().getString(R.string.unknown_medications);
+ getActivity().getResources().getString(R.string.unknown_medications);
String unknownMedicalConditions =
- editInfoActivity.getResources().getString(R.string.unknown_medical_conditions);
+ getActivity().getResources().getString(R.string.unknown_medical_conditions);
String unknownOrganDonor =
- editInfoActivity.getResources().getString(R.string.unknown_organ_donor);
+ getActivity().getResources().getString(R.string.unknown_organ_donor);
- assertNotSame(unknownName, namePreference.getSummary());
- assertNotSame(unknownAddress, addressPreference.getSummary());
- assertNotSame(unknownBloodType, bloodTypePreference.getSummary());
- assertNotSame(unknownAllergies, allergiesPreference.getSummary());
- assertNotSame(unknownMedications, medicationsPreference.getSummary());
- assertNotSame(unknownMedicalConditions, medicalConditionsPreference.getSummary());
- assertNotSame(unknownOrganDonor, organDonorPreference.getSummary());
- assertEquals(1, emergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(1, emergencyContactsPreference.getPreferenceCount());
+ assertThat(namePreference.getSummary()).isNotEqualTo(unknownName);
+ assertThat(addressPreference.getSummary()).isNotEqualTo(unknownAddress);
+ assertThat(bloodTypePreference.getSummary()).isNotEqualTo(unknownBloodType);
+ assertThat(allergiesPreference.getSummary()).isNotEqualTo(unknownAllergies);
+ assertThat(medicationsPreference.getSummary()).isNotEqualTo(unknownMedications);
+ assertThat(medicalConditionsPreference.getSummary()).isNotEqualTo(unknownMedicalConditions);
+ assertThat(organDonorPreference.getSummary()).isNotEqualTo(unknownOrganDonor);
+ assertThat(emergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(1);
+ assertThat(emergencyContactsPreference.getPreferenceCount()).isEqualTo(1);
EditInfoActivity.ClearAllDialogFragment clearAllDialogFragment =
- (EditInfoActivity.ClearAllDialogFragment) editInfoActivity.getFragmentManager()
+ (EditInfoActivity.ClearAllDialogFragment) getActivity().getFragmentManager()
.findFragmentByTag(EditInfoActivity.TAG_CLEAR_ALL_DIALOG);
- assertNull(clearAllDialogFragment);
- editInfoActivity.getMenu().performIdentifierAction(R.id.action_clear_all, 0 /* flags */);
+ assertThat(clearAllDialogFragment).isNull();
+ getInstrumentation().invokeMenuActionSync(getActivity(), R.id.action_clear_all,
+ 0 /* flags */);
getInstrumentation().waitForIdleSync();
final EditInfoActivity.ClearAllDialogFragment clearAllDialogFragmentAfterwards =
- (EditInfoActivity.ClearAllDialogFragment) editInfoActivity.getFragmentManager()
+ (EditInfoActivity.ClearAllDialogFragment) getActivity().getFragmentManager()
.findFragmentByTag(EditInfoActivity.TAG_CLEAR_ALL_DIALOG);
- assertTrue(clearAllDialogFragmentAfterwards.getDialog().isShowing());
+ assertThat(clearAllDialogFragmentAfterwards).isNotNull();
+ Dialog clearAllDialog = clearAllDialogFragmentAfterwards.getDialog();
+ assertThat(clearAllDialog).isNotNull();
+ assertThat(clearAllDialog.isShowing()).isTrue();
runTestOnUiThread(new Runnable() {
@Override
@@ -175,159 +185,46 @@
});
getInstrumentation().waitForIdleSync();
- assertEquals(mFragments, editInfoActivity.getFragments());
+ // After the clear all the preferences dialog is confirmed, the preferences values are
+ // reloaded, and the existing object references are updated in-place.
+ assertThat(namePreference.getSummary()).isNull();
+ assertThat(addressPreference.getSummary()).isNull();
+ assertThat(bloodTypePreference.getSummary().toString()).isEqualTo(unknownBloodType);
+ assertThat(allergiesPreference.getSummary()).isNull();
+ assertThat(medicationsPreference.getSummary()).isNull();
+ assertThat(medicalConditionsPreference.getSummary()).isNull();
+ assertThat(organDonorPreference.getSummary()).isEqualTo(unknownOrganDonor);
+ assertThat(emergencyContactsPreference.getEmergencyContacts()).isEmpty();
+ assertThat(emergencyContactsPreference.getPreferenceCount()).isEqualTo(0);
+ // The preference values are not displayed, being empty.
+ for (String key : PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO) {
+ assertWithMessage(key).that(mMedicalInfoParent.findPreference(key)).isNull();
+ }
- // After clearing all the preferences, onCreate is called for both fragments.
- // This makes the preferences point to old ones. Here we load what the user
- // is seeing
- final NameAutoCompletePreference namePreferenceAfterClear =
- (NameAutoCompletePreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_NAME);
- final EmergencyEditTextPreference addressPreferenceAfterClear =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_ADDRESS);
- final EmergencyListPreference bloodTypePreferenceAfterClear =
- (EmergencyListPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_BLOOD_TYPE);
- final EmergencyEditTextPreference allergiesPreferenceAfterClear =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_ALLERGIES);
- final EmergencyEditTextPreference medicationsPreferenceAfterClear =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_MEDICATIONS);
- final EmergencyEditTextPreference medicalConditionsPreferenceAfterClear =
- (EmergencyEditTextPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_MEDICAL_CONDITIONS);
- final EmergencyListPreference organDonorPreferenceAfterClear =
- (EmergencyListPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_ORGAN_DONOR);
-
- final EmergencyContactsPreference emergencyContactsPreferenceAfterClear =
- (EmergencyContactsPreference) mEditEmergencyContactsFragment
- .findPreference(PreferenceKeys.KEY_EMERGENCY_CONTACTS);
-
- assertEquals(unknownName, namePreferenceAfterClear.getSummary());
- assertEquals(unknownAddress, addressPreferenceAfterClear.getSummary());
- assertEquals(unknownBloodType, bloodTypePreferenceAfterClear.getSummary().toString());
- assertEquals(unknownAllergies, allergiesPreferenceAfterClear.getSummary());
- assertEquals(unknownMedications, medicationsPreferenceAfterClear.getSummary());
- assertEquals(unknownMedicalConditions, medicalConditionsPreferenceAfterClear.getSummary());
- assertEquals(unknownOrganDonor, organDonorPreferenceAfterClear.getSummary());
- assertEquals(0, emergencyContactsPreferenceAfterClear.getEmergencyContacts().size());
- assertEquals(0, emergencyContactsPreferenceAfterClear.getPreferenceCount());
-
- assertTrue(ContactTestUtils
- .deleteContact(getActivity().getContentResolver(), "Michael", "789"));
+ assertThat(ContactTestUtils
+ .deleteContact(getActivity().getContentResolver(), "Michael", "789")).isTrue();
}
- public void testWarningDialog_onPauseAndResume() throws Throwable {
- final EditInfoActivity.WarningDialogFragment dialog =
- (EditInfoActivity.WarningDialogFragment) getActivity().getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- assertTrue(dialog.getDialog().isShowing());
+ public void testAddContactPreference() throws Throwable {
+ Preference addContactPreference =
+ mFragment.findPreference(PreferenceKeys.KEY_ADD_EMERGENCY_CONTACT);
+ assertThat(addContactPreference).isNotNull();
- onPause();
- onResume();
+ IntentFilter intentFilter = new IntentFilter(Intent.ACTION_PICK);
+ intentFilter.addDataType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE);
- final EditInfoActivity.WarningDialogFragment dialogAfterOnResume =
- (EditInfoActivity.WarningDialogFragment) getActivity().getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- assertTrue(dialogAfterOnResume.getDialog().isShowing());
- }
-
- public void testWarningDialog_negativeButton() throws Throwable {
- EditInfoActivity activity = getActivity();
- final EditInfoActivity.WarningDialogFragment dialogFragment =
- (EditInfoActivity.WarningDialogFragment) activity.getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- assertNotNull(dialogFragment.getActivity());
- assertTrue(dialogFragment.getDialog().isShowing());
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- ((AlertDialog) dialogFragment.getDialog())
- .getButton(DialogInterface.BUTTON_NEGATIVE)
- .performClick();
- }
- });
- getInstrumentation().waitForIdleSync();
-
- assertNull(dialogFragment.getDialog());
- }
-
- public void testWarningDialog_positiveButton() throws Throwable {
- EditInfoActivity activity = getActivity();
- final EditInfoActivity.WarningDialogFragment dialogFragment =
- (EditInfoActivity.WarningDialogFragment) activity.getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- assertTrue(dialogFragment.getDialog().isShowing());
+ Instrumentation.ActivityMonitor activityMonitor =
+ getInstrumentation().addMonitor(intentFilter, null, true /* block */);
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- ((AlertDialog) dialogFragment.getDialog())
- .getButton(DialogInterface.BUTTON_POSITIVE)
- .performClick();
+ addContactPreference
+ .getOnPreferenceClickListener().onPreferenceClick(addContactPreference);
}
});
- getInstrumentation().waitForIdleSync();
- assertNull(dialogFragment.getDialog());
- onPause();
- onResume();
-
- EditInfoActivity.WarningDialogFragment dialogAfterOnResume =
- (EditInfoActivity.WarningDialogFragment) getActivity().getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- assertNull(dialogAfterOnResume);
- }
-
- public void testWarningDialogTimer_overOneDayAgo() throws Throwable {
- EditInfoActivity activity = getActivity();
- final EditInfoActivity.WarningDialogFragment dialogFragment =
- (EditInfoActivity.WarningDialogFragment) activity.getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- ((AlertDialog) dialogFragment.getDialog())
- .getButton(DialogInterface.BUTTON_POSITIVE)
- .performClick();
- }
- });
- getInstrumentation().waitForIdleSync();
-
- onPause();
- // Manually make the last consent be a bit over a day ago
- long overOneDayAgoMs = System.currentTimeMillis() - EditInfoActivity.ONE_DAY_MS - 60_000;
- PreferenceManager.getDefaultSharedPreferences(activity).edit()
- .putLong(EditInfoActivity.KEY_LAST_CONSENT_TIME_MS,
- overOneDayAgoMs).commit();
- onResume();
-
- EditInfoActivity.WarningDialogFragment dialogAfterOnResume =
- (EditInfoActivity.WarningDialogFragment) getActivity().getFragmentManager()
- .findFragmentByTag(EditInfoActivity.TAG_WARNING_DIALOG);
- assertTrue(dialogAfterOnResume.getDialog().isShowing());
- }
-
- private void onPause() throws Throwable {
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- getInstrumentation().callActivityOnPause(getActivity());
- }
- });
- }
-
- private void onResume() throws Throwable {
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- getInstrumentation().callActivityOnResume(getActivity());
- }
- });
- getInstrumentation().waitForIdleSync();
+ assertThat(getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */)).isTrue();
}
private void forceScreenOn() {
diff --git a/tests/src/com/android/emergency/preferences/ContactPreferenceTest.java b/tests/src/com/android/emergency/preferences/ContactPreferenceTest.java
index 39271a0..d2ec9fd 100644
--- a/tests/src/com/android/emergency/preferences/ContactPreferenceTest.java
+++ b/tests/src/com/android/emergency/preferences/ContactPreferenceTest.java
@@ -15,6 +15,8 @@
*/
package com.android.emergency.preferences;
+import static com.google.common.truth.Truth.assertThat;
+
import android.app.Instrumentation;
import android.content.Intent;
import android.content.IntentFilter;
@@ -51,18 +53,18 @@
@Override
protected void tearDown() throws Exception {
- assertTrue(ContactTestUtils.deleteContact(getActivity().getContentResolver(),
+ assertThat(ContactTestUtils.deleteContact(getActivity().getContentResolver(),
NAME,
- PHONE_NUMBER));
+ PHONE_NUMBER)).isTrue();
super.tearDown();
}
public void testContactPreference() {
- assertEquals(mPhoneUri, mContactPreference.getPhoneUri());
- assertEquals(NAME, mContactPreference.getContact().getName());
- assertEquals(PHONE_NUMBER, mContactPreference.getContact().getPhoneNumber());
+ assertThat(mContactPreference.getPhoneUri()).isEqualTo(mPhoneUri);
+ assertThat(mContactPreference.getContact().getName()).isEqualTo(NAME);
+ assertThat(mContactPreference.getContact().getPhoneNumber()).isEqualTo(PHONE_NUMBER);
- assertNull(mContactPreference.getRemoveContactDialog());
+ assertThat(mContactPreference.getRemoveContactDialog()).isNull();
mContactPreference.setRemoveContactPreferenceListener(
new ContactPreference.RemoveContactPreferenceListener() {
@Override
@@ -70,10 +72,9 @@
// Do nothing
}
});
- assertNotNull(mContactPreference.getRemoveContactDialog());
+ assertThat(mContactPreference.getRemoveContactDialog()).isNotNull();
}
-
public void testDisplayContact() throws Throwable {
IntentFilter intentFilter = new IntentFilter(Intent.ACTION_VIEW);
intentFilter.addDataType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
@@ -81,7 +82,7 @@
getInstrumentation().addMonitor(intentFilter, null, true /* block */);
mContactPreference.displayContact();
- assertEquals(true, getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */));
+ assertThat(getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */)).isTrue();
}
public void testCallContact() throws Throwable {
@@ -91,6 +92,6 @@
getInstrumentation().addMonitor(intentFilter, null, true /* block */);
mContactPreference.callContact();
- assertEquals(true, getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */));
+ assertThat(getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */)).isTrue();
}
}
diff --git a/tests/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
index cf66b6f..45bea8b 100644
--- a/tests/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
+++ b/tests/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
@@ -15,10 +15,13 @@
*/
package com.android.emergency.preferences;
+import static com.google.common.truth.Truth.assertThat;
+
import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.DialogInterface;
import android.net.Uri;
+import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
@@ -27,7 +30,6 @@
import com.android.emergency.ContactTestUtils;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
-import com.android.emergency.edit.EditEmergencyContactsFragment;
import com.android.emergency.edit.EditInfoActivity;
import java.util.ArrayList;
@@ -39,8 +41,8 @@
@LargeTest
public class EmergencyContactsPreferenceTest
extends ActivityInstrumentationTestCase2<EditInfoActivity> {
+ private PreferenceFragment mEditInfoFragment;
private EmergencyContactsPreference mEmergencyContactsPreference;
- private EditEmergencyContactsFragment mEditEmergencyContactsFragment;
private ContentResolver mContentResolver;
public EmergencyContactsPreferenceTest() {
@@ -50,10 +52,10 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mEditEmergencyContactsFragment =
- (EditEmergencyContactsFragment) getActivity().getFragments().get(1).second;
+ mEditInfoFragment = getActivity().getFragment();
+
mEmergencyContactsPreference =
- (EmergencyContactsPreference) mEditEmergencyContactsFragment
+ (EmergencyContactsPreference) mEditInfoFragment
.findPreference(PreferenceKeys.KEY_EMERGENCY_CONTACTS);
try {
runTestOnUiThread(new Runnable() {
@@ -63,7 +65,7 @@
}
});
} catch (Throwable throwable) {
- fail("Should not throw exception: " + throwable.getMessage());
+ fail("Should not throw exception: " + throwable.getMessage());
}
mContentResolver = getActivity().getContentResolver();
@@ -76,11 +78,11 @@
}
public void testEmptyState() {
- assertNotNull(mEmergencyContactsPreference);
- assertTrue(mEmergencyContactsPreference.isPersistent());
- assertTrue(mEmergencyContactsPreference.isNotSet());
- assertTrue(mEmergencyContactsPreference.getEmergencyContacts().isEmpty());
- assertEquals(0, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference).isNotNull();
+ assertThat(mEmergencyContactsPreference.isPersistent()).isTrue();
+ assertThat(mEmergencyContactsPreference.isNotSet()).isTrue();
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts()).isEmpty();
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(0);
}
public void testAddAndRemoveEmergencyContact() throws Throwable {
@@ -96,14 +98,14 @@
}
});
- assertEquals(1, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(1, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(1);
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(1);
ContactPreference contactPreference = (ContactPreference)
mEmergencyContactsPreference.getPreference(0);
- assertEquals(phoneUri, contactPreference.getPhoneUri());
- assertEquals(name, contactPreference.getTitle());
- assertTrue(((String) contactPreference.getSummary()).contains(phoneNumber));
+ assertThat(contactPreference.getPhoneUri()).isEqualTo(phoneUri);
+ assertThat(contactPreference.getTitle()).isEqualTo(name);
+ assertThat((String) contactPreference.getSummary()).contains(phoneNumber);
runTestOnUiThread(new Runnable() {
@Override
@@ -113,11 +115,11 @@
}
});
- assertEquals(0, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(0, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts()).isEmpty();
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(0);
// Clean up the inserted contact
- assertTrue(ContactTestUtils.deleteContact(mContentResolver, name, phoneNumber));
+ assertThat(ContactTestUtils.deleteContact(mContentResolver, name, phoneNumber)).isTrue();
}
public void testReloadFromPreference() throws Throwable {
@@ -141,12 +143,12 @@
}
});
- assertEquals(2, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(2, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(2);
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(2);
// Delete Jane from another app (e.g. contacts)
- assertTrue(ContactTestUtils
- .deleteContact(mContentResolver, nameJane, phoneNumberJane));
+ assertThat(ContactTestUtils
+ .deleteContact(mContentResolver, nameJane, phoneNumberJane)).isTrue();
getInstrumentation().waitForIdleSync();
runTestOnUiThread(new Runnable() {
@@ -159,15 +161,15 @@
getInstrumentation().waitForIdleSync();
// Assert the only remaining contact is John
- assertEquals(1, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(1, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(1);
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(1);
ContactPreference contactPreference = (ContactPreference)
mEmergencyContactsPreference.getPreference(0);
- assertEquals(emergencyContactJohn, contactPreference.getPhoneUri());
+ assertThat(contactPreference.getPhoneUri()).isEqualTo(emergencyContactJohn);
// Clean up the inserted contact
- assertTrue(ContactTestUtils
- .deleteContact(mContentResolver, nameJohn, phoneNumberJohn));
+ assertThat(ContactTestUtils
+ .deleteContact(mContentResolver, nameJohn, phoneNumberJohn)).isTrue();
}
public void testWidgetClick_positiveButton() throws Throwable {
@@ -183,15 +185,15 @@
}
});
- assertEquals(1, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(1, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(1);
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(1);
ContactPreference contactPreference = (ContactPreference)
mEmergencyContactsPreference.getPreference(0);
View contactPreferenceView = contactPreference.getView(null, null);
- assertNotNull(contactPreferenceView);
+ assertThat(contactPreferenceView).isNotNull();
final View deleteContactWidget = contactPreferenceView.findViewById(R.id.delete_contact);
- assertEquals(View.VISIBLE, deleteContactWidget.getVisibility());
+ assertThat(deleteContactWidget.getVisibility()).isEqualTo(View.VISIBLE);
runTestOnUiThread(new Runnable() {
@Override
@@ -202,7 +204,7 @@
getInstrumentation().waitForIdleSync();
final AlertDialog removeContactDialog = contactPreference.getRemoveContactDialog();
- assertTrue(removeContactDialog.isShowing());
+ assertThat(removeContactDialog.isShowing()).isTrue();
runTestOnUiThread(new Runnable() {
@Override
@@ -212,11 +214,11 @@
});
getInstrumentation().waitForIdleSync();
- assertEquals(0, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(0, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts()).isEmpty();
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(0);
// Clean up the inserted contact
- assertTrue(ContactTestUtils.deleteContact(mContentResolver, name, phoneNumber));
+ assertThat(ContactTestUtils.deleteContact(mContentResolver, name, phoneNumber)).isTrue();
}
public void testWidgetClick_negativeButton() throws Throwable {
@@ -232,15 +234,15 @@
}
});
- assertEquals(1, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(1, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(1);
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(1);
ContactPreference contactPreference = (ContactPreference)
mEmergencyContactsPreference.getPreference(0);
View contactPreferenceView = contactPreference.getView(null, null);
- assertNotNull(contactPreferenceView);
+ assertThat(contactPreferenceView).isNotNull();
final View deleteContactWidget = contactPreferenceView.findViewById(R.id.delete_contact);
- assertEquals(View.VISIBLE, deleteContactWidget.getVisibility());
+ assertThat(deleteContactWidget.getVisibility()).isEqualTo(View.VISIBLE);
runTestOnUiThread(new Runnable() {
@Override
@@ -252,7 +254,7 @@
getInstrumentation().waitForIdleSync();
final AlertDialog removeContactDialog = contactPreference.getRemoveContactDialog();
- assertTrue(removeContactDialog.isShowing());
+ assertThat(removeContactDialog.isShowing()).isTrue();
runTestOnUiThread(new Runnable() {
@Override
@@ -261,10 +263,10 @@
}
});
- assertEquals(1, mEmergencyContactsPreference.getEmergencyContacts().size());
- assertEquals(1, mEmergencyContactsPreference.getPreferenceCount());
+ assertThat(mEmergencyContactsPreference.getEmergencyContacts().size()).isEqualTo(1);
+ assertThat(mEmergencyContactsPreference.getPreferenceCount()).isEqualTo(1);
// Clean up the inserted contact
- assertTrue(ContactTestUtils.deleteContact(mContentResolver, name, phoneNumber));
+ assertThat(ContactTestUtils.deleteContact(mContentResolver, name, phoneNumber)).isTrue();
}
}
diff --git a/tests/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java b/tests/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
index 8f7551b..b1993a6 100644
--- a/tests/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
+++ b/tests/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
@@ -15,32 +15,34 @@
*/
package com.android.emergency.preferences;
+import static com.google.common.truth.Truth.assertThat;
+
import android.preference.PreferenceManager;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.MediumTest;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
-import com.android.emergency.edit.EditEmergencyInfoFragment;
-import com.android.emergency.edit.EditInfoActivity;
+import com.android.emergency.edit.EditMedicalInfoActivity;
+import com.android.emergency.edit.EditMedicalInfoFragment;
/**
* Tests for {@link EmergencyEditTextPreference}.
*/
@MediumTest
public class EmergencyEditTextPreferenceTest
- extends ActivityInstrumentationTestCase2<EditInfoActivity> {
+ extends ActivityInstrumentationTestCase2<EditMedicalInfoActivity> {
private EmergencyEditTextPreference mPreference;
- private EditEmergencyInfoFragment mEditInfoFragment;
+ private EditMedicalInfoFragment mEditInfoFragment;
public EmergencyEditTextPreferenceTest() {
- super(EditInfoActivity.class);
+ super(EditMedicalInfoActivity.class);
}
@Override
protected void setUp() throws Exception {
super.setUp();
- mEditInfoFragment = (EditEmergencyInfoFragment) getActivity().getFragments().get(0).second;
+ mEditInfoFragment = getActivity().getFragment();
mPreference = (EmergencyEditTextPreference)
mEditInfoFragment.findPreference(PreferenceKeys.KEY_MEDICAL_CONDITIONS);
try {
@@ -65,24 +67,24 @@
String summary = (String) mPreference.getSummary();
String summaryExp =
getActivity().getResources().getString(R.string.unknown_medical_conditions);
- assertEquals(summaryExp, summary);
+ assertThat(summary).isEqualTo(summaryExp);
}
public void testTitle() {
String title = (String) mPreference.getTitle();
String titleExp =
getActivity().getResources().getString(R.string.medical_conditions);
- assertEquals(titleExp, title);
+ assertThat(title).isEqualTo(titleExp);
}
public void testProperties() {
- assertNotNull(mPreference);
- assertEquals(PreferenceKeys.KEY_MEDICAL_CONDITIONS, mPreference.getKey());
- assertTrue(mPreference.isEnabled());
- assertTrue(mPreference.isPersistent());
- assertTrue(mPreference.isSelectable());
- assertTrue(mPreference.isNotSet());
- assertEquals("", mPreference.getText());
+ assertThat(mPreference).isNotNull();
+ assertThat(mPreference.getKey()).isEqualTo(PreferenceKeys.KEY_MEDICAL_CONDITIONS);
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreference.isPersistent()).isTrue();
+ assertThat(mPreference.isSelectable()).isTrue();
+ assertThat(mPreference.isNotSet()).isTrue();
+ assertThat(mPreference.getText()).isEqualTo("");
}
public void testReloadFromPreference() throws Throwable {
@@ -95,8 +97,8 @@
mPreference.reloadFromPreference();
}
});
- assertEquals(medicalConditions, mPreference.getText());
- assertFalse(mPreference.isNotSet());
+ assertThat(mPreference.getText()).isEqualTo(medicalConditions);
+ assertThat(mPreference.isNotSet()).isFalse();
}
public void testSetText() throws Throwable {
@@ -108,7 +110,7 @@
}
});
- assertEquals(medicalConditions, mPreference.getText());
- assertEquals(medicalConditions, mPreference.getSummary());
+ assertThat(mPreference.getText()).isEqualTo(medicalConditions);
+ assertThat(mPreference.getSummary()).isEqualTo(medicalConditions);
}
}
diff --git a/tests/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java b/tests/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
index d6f455a..cc970f0 100644
--- a/tests/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
@@ -15,6 +15,8 @@
*/
package com.android.emergency.preferences;
+import static com.google.common.truth.Truth.assertThat;
+
import android.preference.PreferenceManager;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
@@ -24,27 +26,27 @@
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
-import com.android.emergency.edit.EditEmergencyInfoFragment;
-import com.android.emergency.edit.EditInfoActivity;
+import com.android.emergency.edit.EditMedicalInfoActivity;
+import com.android.emergency.edit.EditMedicalInfoFragment;
/**
* Tests for {@link EmergencyListPreference}.
*/
@LargeTest
public class EmergencyListPreferenceTest
- extends ActivityInstrumentationTestCase2<EditInfoActivity> {
+ extends ActivityInstrumentationTestCase2<EditMedicalInfoActivity> {
private EmergencyListPreference mOrganDonorPreference;
private EmergencyListPreference mBloodTypeListPreference;
- private EditEmergencyInfoFragment mEditInfoFragment;
+ private EditMedicalInfoFragment mEditInfoFragment;
public EmergencyListPreferenceTest() {
- super(EditInfoActivity.class);
+ super(EditMedicalInfoActivity.class);
}
@Override
protected void setUp() throws Exception {
super.setUp();
- mEditInfoFragment = (EditEmergencyInfoFragment) getActivity().getFragments().get(0).second;
+ mEditInfoFragment = getActivity().getFragment();
mOrganDonorPreference = (EmergencyListPreference)
mEditInfoFragment.findPreference(PreferenceKeys.KEY_ORGAN_DONOR);
mBloodTypeListPreference = (EmergencyListPreference)
@@ -72,54 +74,54 @@
String summary = (String) mOrganDonorPreference.getSummary();
String summaryExp =
getActivity().getResources().getString(R.string.unknown_organ_donor);
- assertEquals(summaryExp, summary);
+ assertThat(summary).isEqualTo(summaryExp);
}
public void testSummary_bloodType() {
String summary = mBloodTypeListPreference.getSummary().toString();
CharSequence summaryExp =
getActivity().getResources().getString(R.string.unknown_blood_type);
- assertEquals(summaryExp, summary);
+ assertThat(summary).isEqualTo(summaryExp);
}
public void testTitle_organDonor() {
String title = (String) mOrganDonorPreference.getTitle();
String titleExp =
getActivity().getResources().getString(R.string.organ_donor);
- assertEquals(titleExp, title);
+ assertThat(title).isEqualTo(titleExp);
}
public void testTitle_bloodType() {
String title = (String) mBloodTypeListPreference.getTitle();
String titleExp =
getActivity().getResources().getString(R.string.blood_type);
- assertEquals(titleExp, title);
+ assertThat(title).isEqualTo(titleExp);
}
public void testProperties_organDonor() {
- assertNotNull(mOrganDonorPreference);
- assertEquals(PreferenceKeys.KEY_ORGAN_DONOR, mOrganDonorPreference.getKey());
- assertTrue(mOrganDonorPreference.isEnabled());
- assertTrue(mOrganDonorPreference.isPersistent());
- assertTrue(mOrganDonorPreference.isSelectable());
- assertTrue(mOrganDonorPreference.isNotSet());
- assertEquals("", mOrganDonorPreference.getValue());
- assertEquals(mOrganDonorPreference.getEntryValues().length,
- mOrganDonorPreference.getEntries().length);
+ assertThat(mOrganDonorPreference).isNotNull();
+ assertThat(mOrganDonorPreference.getKey()).isEqualTo(PreferenceKeys.KEY_ORGAN_DONOR);
+ assertThat(mOrganDonorPreference.isEnabled()).isTrue();
+ assertThat(mOrganDonorPreference.isPersistent()).isTrue();
+ assertThat(mOrganDonorPreference.isSelectable()).isTrue();
+ assertThat(mOrganDonorPreference.isNotSet()).isTrue();
+ assertThat(mOrganDonorPreference.getValue()).isEqualTo("");
+ assertThat(mOrganDonorPreference.getEntries().length).isEqualTo(
+ mOrganDonorPreference.getEntryValues().length);
assertNull(mOrganDonorPreference.getContentDescriptions());
}
public void testProperties_bloodType() {
- assertNotNull(mBloodTypeListPreference);
- assertEquals(PreferenceKeys.KEY_BLOOD_TYPE, mBloodTypeListPreference.getKey());
- assertTrue(mBloodTypeListPreference.isEnabled());
- assertTrue(mBloodTypeListPreference.isPersistent());
- assertTrue(mBloodTypeListPreference.isSelectable());
- assertTrue(mBloodTypeListPreference.isNotSet());
- assertEquals("", mBloodTypeListPreference.getValue());
- assertEquals(mBloodTypeListPreference.getEntryValues().length,
- mBloodTypeListPreference.getEntries().length);
- assertEquals(mBloodTypeListPreference.getContentDescriptions().length,
+ assertThat(mBloodTypeListPreference).isNotNull();
+ assertThat(mBloodTypeListPreference.getKey()).isEqualTo(PreferenceKeys.KEY_BLOOD_TYPE);
+ assertThat(mBloodTypeListPreference.isEnabled()).isTrue();
+ assertThat(mBloodTypeListPreference.isPersistent()).isTrue();
+ assertThat(mBloodTypeListPreference.isSelectable()).isTrue();
+ assertThat(mBloodTypeListPreference.isNotSet()).isTrue();
+ assertThat(mBloodTypeListPreference.getValue()).isEqualTo("");
+ assertThat(mBloodTypeListPreference.getEntries().length).isEqualTo(
+ mBloodTypeListPreference.getEntryValues().length);
+ assertThat(mBloodTypeListPreference.getContentDescriptions().length).isEqualTo(
mBloodTypeListPreference.getEntries().length);
}
@@ -135,8 +137,9 @@
mOrganDonorPreference.reloadFromPreference();
}
});
- assertEquals(mOrganDonorPreference.getEntryValues()[0], mOrganDonorPreference.getValue());
- assertFalse(mOrganDonorPreference.isNotSet());
+ assertThat(mOrganDonorPreference.getValue()).isEqualTo(
+ mOrganDonorPreference.getEntryValues()[0]);
+ assertThat(mOrganDonorPreference.isNotSet()).isFalse();
}
public void testSetValue() throws Throwable {
@@ -150,14 +153,14 @@
}
});
- assertEquals(mOrganDonorPreference.getEntryValues()[index],
- mOrganDonorPreference.getValue());
+ assertThat(mOrganDonorPreference.getValue()).isEqualTo(
+ mOrganDonorPreference.getEntryValues()[index]);
if (!TextUtils.isEmpty(mOrganDonorPreference.getEntryValues()[index])) {
- assertEquals(mOrganDonorPreference.getEntries()[index],
- mOrganDonorPreference.getSummary());
+ assertThat(mOrganDonorPreference.getSummary()).isEqualTo(
+ mOrganDonorPreference.getEntries()[index]);
} else {
- assertEquals(getActivity().getResources().getString(R.string.unknown_organ_donor),
- mOrganDonorPreference.getSummary());
+ assertThat(mOrganDonorPreference.getSummary()).isEqualTo(
+ getActivity().getResources().getString(R.string.unknown_organ_donor));
}
}
}
@@ -167,9 +170,9 @@
SpannableString entry = ((SpannableString) mBloodTypeListPreference.getEntries()[i]);
TtsSpan[] span = entry.getSpans(0,
mBloodTypeListPreference.getContentDescriptions().length, TtsSpan.class);
- assertEquals(1, span.length);
- assertEquals(span[0].getArgs().get(TtsSpan.ARG_TEXT),
- mBloodTypeListPreference.getContentDescriptions()[i]);
+ assertThat(span.length).isEqualTo(1);
+ assertThat(mBloodTypeListPreference.getContentDescriptions()[i]).isEqualTo(
+ span[0].getArgs().get(TtsSpan.ARG_TEXT));
}
}
}
diff --git a/tests/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java b/tests/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
index 9259780..cad30b2 100644
--- a/tests/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
+++ b/tests/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
@@ -15,6 +15,8 @@
*/
package com.android.emergency.preferences;
+import static com.google.common.truth.Truth.assertThat;
+
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.preference.PreferenceManager;
@@ -24,26 +26,26 @@
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
-import com.android.emergency.edit.EditEmergencyInfoFragment;
-import com.android.emergency.edit.EditInfoActivity;
+import com.android.emergency.edit.EditMedicalInfoActivity;
+import com.android.emergency.edit.EditMedicalInfoFragment;
/**
* Tests for {@link NameAutoCompletePreference}.
*/
@LargeTest
public class NameAutoCompletePreferenceTest
- extends ActivityInstrumentationTestCase2<EditInfoActivity> {
+ extends ActivityInstrumentationTestCase2<EditMedicalInfoActivity> {
private NameAutoCompletePreference mNameAutoCompletePreference;
- private EditEmergencyInfoFragment mEditInfoFragment;
+ private EditMedicalInfoFragment mEditInfoFragment;
public NameAutoCompletePreferenceTest() {
- super(EditInfoActivity.class);
+ super(EditMedicalInfoActivity.class);
}
@Override
protected void setUp() throws Exception {
super.setUp();
- mEditInfoFragment = (EditEmergencyInfoFragment) getActivity().getFragments().get(0).second;
+ mEditInfoFragment = getActivity().getFragment();
mNameAutoCompletePreference = (NameAutoCompletePreference)
mEditInfoFragment.findPreference(PreferenceKeys.KEY_NAME);
try {
@@ -68,24 +70,24 @@
String summary = (String) mNameAutoCompletePreference.getSummary();
String summaryExp =
getActivity().getResources().getString(R.string.unknown_name);
- assertEquals(summaryExp, summary);
+ assertThat(summary).isEqualTo(summaryExp);
}
public void testTitle() {
String title = (String) mNameAutoCompletePreference.getTitle();
String titleExp =
getActivity().getResources().getString(R.string.name);
- assertEquals(titleExp, title);
+ assertThat(title).isEqualTo(titleExp);
}
public void testProperties() {
- assertNotNull(mNameAutoCompletePreference);
- assertEquals(PreferenceKeys.KEY_NAME, mNameAutoCompletePreference.getKey());
- assertTrue(mNameAutoCompletePreference.isEnabled());
- assertTrue(mNameAutoCompletePreference.isPersistent());
- assertTrue(mNameAutoCompletePreference.isSelectable());
- assertTrue(mNameAutoCompletePreference.isNotSet());
- assertEquals("", mNameAutoCompletePreference.getText());
+ assertThat(mNameAutoCompletePreference).isNotNull();
+ assertThat(mNameAutoCompletePreference.getKey()).isEqualTo(PreferenceKeys.KEY_NAME);
+ assertThat(mNameAutoCompletePreference.isEnabled()).isTrue();
+ assertThat(mNameAutoCompletePreference.isPersistent()).isTrue();
+ assertThat(mNameAutoCompletePreference.isSelectable()).isTrue();
+ assertThat(mNameAutoCompletePreference.isNotSet()).isTrue();
+ assertThat(mNameAutoCompletePreference.getText()).isEqualTo("");
}
public void testReloadFromPreference() throws Throwable {
@@ -99,8 +101,8 @@
mNameAutoCompletePreference.reloadFromPreference();
}
});
- assertEquals(name, mNameAutoCompletePreference.getText());
- assertFalse(mNameAutoCompletePreference.isNotSet());
+ assertThat(mNameAutoCompletePreference.getText()).isEqualTo(name);
+ assertThat(mNameAutoCompletePreference.isNotSet()).isFalse();
}
public void testSetText() throws Throwable {
@@ -112,19 +114,19 @@
}
});
- assertEquals(name, mNameAutoCompletePreference.getText());
- assertEquals(name, mNameAutoCompletePreference.getSummary());
+ assertThat(mNameAutoCompletePreference.getText()).isEqualTo(name);
+ assertThat(mNameAutoCompletePreference.getSummary()).isEqualTo(name);
}
public void testGetAutoCompleteTextView() {
AutoCompleteTextView autoCompleteTextView =
mNameAutoCompletePreference.getAutoCompleteTextView();
- assertNotNull(autoCompleteTextView);
+ assertThat(autoCompleteTextView).isNotNull();
}
public void testDialogShowAndDismiss_positiveButton() throws Throwable {
- assertNull(mNameAutoCompletePreference.getDialog());
- assertNotNull(mNameAutoCompletePreference);
+ assertThat(mNameAutoCompletePreference.getDialog()).isNull();
+ assertThat(mNameAutoCompletePreference).isNotNull();
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -132,7 +134,7 @@
}
});
final AlertDialog dialog = (AlertDialog) mNameAutoCompletePreference.getDialog();
- assertTrue(dialog.isShowing());
+ assertThat(dialog.isShowing()).isTrue();
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -140,11 +142,11 @@
}
});
getInstrumentation().waitForIdleSync();
- assertFalse(dialog.isShowing());
+ assertThat(dialog.isShowing()).isFalse();
}
public void testDialogShowAndDismiss_negativeButton() throws Throwable {
- assertNull(mNameAutoCompletePreference.getDialog());
+ assertThat(mNameAutoCompletePreference.getDialog()).isNull();
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -152,7 +154,7 @@
}
});
final AlertDialog dialog = (AlertDialog) mNameAutoCompletePreference.getDialog();
- assertTrue(dialog.isShowing());
+ assertThat(dialog.isShowing()).isTrue();
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -160,6 +162,6 @@
}
});
getInstrumentation().waitForIdleSync();
- assertFalse(dialog.isShowing());
+ assertThat(dialog.isShowing()).isFalse();
}
}
diff --git a/tests/src/com/android/emergency/view/ViewInfoActivityTest.java b/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
index feb8268..f54a5a2 100644
--- a/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
+++ b/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
@@ -15,6 +15,8 @@
*/
package com.android.emergency.view;
+import static com.google.common.truth.Truth.assertThat;
+
import android.app.Fragment;
import android.app.Instrumentation;
import android.content.ComponentName;
@@ -79,10 +81,10 @@
onResume();
mFragments = getActivity().getFragments();
- assertEquals(0, mFragments.size());
- assertEquals(View.GONE, mPersonalCard.getVisibility());
- assertEquals(View.GONE, getActivity().getTabLayout().getVisibility());
- assertEquals(mNoInfoIndex, mViewFlipper.getDisplayedChild());
+ assertThat(mFragments).isEmpty();
+ assertThat(mPersonalCard.getVisibility()).isEqualTo(View.GONE);
+ assertThat(getActivity().getTabLayout().getVisibility()).isEqualTo(View.GONE);
+ assertThat(mViewFlipper.getDisplayedChild()).isEqualTo(mNoInfoIndex);
}
public void testNameSet() throws Throwable {
@@ -95,13 +97,13 @@
onResume();
mFragments = getActivity().getFragments();
- assertEquals(0, mFragments.size());
- assertEquals(View.GONE, getActivity().getTabLayout().getVisibility());
- assertEquals(View.VISIBLE,
- getActivity().findViewById(R.id.no_info).getVisibility());
- assertEquals(mNoInfoIndex, mViewFlipper.getDisplayedChild());
- assertEquals(View.VISIBLE, mPersonalCardLargeItem.getVisibility());
- assertEquals(name, mPersonalCardLargeItem.getText());
+ assertThat(mFragments).isEmpty();
+ assertThat(getActivity().getTabLayout().getVisibility()).isEqualTo(View.GONE);
+ assertThat(getActivity().findViewById(R.id.no_info).getVisibility())
+ .isEqualTo(View.VISIBLE);
+ assertThat(mViewFlipper.getDisplayedChild()).isEqualTo(mNoInfoIndex);
+ assertThat(mPersonalCardLargeItem.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(mPersonalCardLargeItem.getText()).isEqualTo(name);
}
public void testEmergencyInfoSet() throws Throwable {
@@ -114,12 +116,12 @@
onResume();
mFragments = getActivity().getFragments();
- assertEquals(View.GONE, getActivity().getTabLayout().getVisibility());
- assertEquals(mTabsIndex, mViewFlipper.getDisplayedChild());
- assertEquals(1, mFragments.size());
+ assertThat(getActivity().getTabLayout().getVisibility()).isEqualTo(View.GONE);
+ assertThat(mViewFlipper.getDisplayedChild()).isEqualTo(mTabsIndex);
+ assertThat(mFragments.size()).isEqualTo(1);
ViewEmergencyInfoFragment viewEmergencyInfoFragment =
(ViewEmergencyInfoFragment) mFragments.get(0).second;
- assertNotNull(viewEmergencyInfoFragment);
+ assertThat(viewEmergencyInfoFragment).isNotNull();
}
public void testEmergencyContactSet() throws Throwable {
@@ -134,15 +136,16 @@
onResume();
mFragments = getActivity().getFragments();
- assertEquals(mTabsIndex, mViewFlipper.getDisplayedChild());
- assertEquals(1, mFragments.size());
- assertEquals(View.GONE, getActivity().getTabLayout().getVisibility());
+ assertThat(mViewFlipper.getDisplayedChild()).isEqualTo(mTabsIndex);
+ assertThat(mFragments.size()).isEqualTo(1);
+ assertThat(getActivity().getTabLayout().getVisibility()).isEqualTo(View.GONE);
ViewEmergencyContactsFragment viewEmergencyContactsFragment =
(ViewEmergencyContactsFragment) mFragments.get(0).second;
- assertNotNull(viewEmergencyContactsFragment);
+ assertThat(viewEmergencyContactsFragment).isNotNull();
- assertTrue(ContactTestUtils.deleteContact(getActivity().getContentResolver(),
- "John", "123"));
+ assertThat(
+ ContactTestUtils.deleteContact(getActivity().getContentResolver(), "John", "123"))
+ .isTrue();
}
public void testInfoAndEmergencyContactsSet() throws Throwable {
@@ -161,18 +164,19 @@
onResume();
mFragments = getActivity().getFragments();
- assertEquals(mTabsIndex, mViewFlipper.getDisplayedChild());
- assertEquals(2, mFragments.size());
- assertEquals(View.VISIBLE, getActivity().getTabLayout().getVisibility());
+ assertThat(mViewFlipper.getDisplayedChild()).isEqualTo(mTabsIndex);
+ assertThat(mFragments.size()).isEqualTo(2);
+ assertThat(getActivity().getTabLayout().getVisibility()).isEqualTo(View.VISIBLE);
ViewEmergencyInfoFragment viewEmergencyInfoFragment =
(ViewEmergencyInfoFragment) mFragments.get(0).second;
- assertNotNull(viewEmergencyInfoFragment);
+ assertThat(viewEmergencyInfoFragment).isNotNull();
ViewEmergencyContactsFragment viewEmergencyContactsFragment =
(ViewEmergencyContactsFragment) mFragments.get(1).second;
- assertNotNull(viewEmergencyContactsFragment);
+ assertThat(viewEmergencyContactsFragment).isNotNull();
- assertTrue(ContactTestUtils.deleteContact(getActivity().getContentResolver(),
- "John", "123"));
+ assertThat(
+ ContactTestUtils.deleteContact(getActivity().getContentResolver(), "John", "123"))
+ .isTrue();
}
public void testCanGoToEditInfoActivityFromMenu() {
@@ -186,26 +190,8 @@
EditInfoActivity editInfoActivity = (EditInfoActivity)
getInstrumentation().waitForMonitorWithTimeout(activityMonitor, 1000 /* timeOut */);
- assertNotNull(editInfoActivity);
- assertEquals(true, getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */));
- editInfoActivity.finish();
- }
-
- public void testCanGoToEditInfoActivityFromBroadcast() {
- String action = "android.emergency.EDIT_EMERGENCY_CONTACTS";
- Instrumentation.ActivityMonitor activityMonitor =
- getInstrumentation().addMonitor(new IntentFilter(action),
- null /* result */, false /* block */);
- getActivity().startActivity(new Intent(action));
-
- getInstrumentation().waitForIdleSync();
- assertEquals(true, getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */));
-
- EditInfoActivity editInfoActivity = (EditInfoActivity)
- getInstrumentation().waitForMonitorWithTimeout(activityMonitor, 1000 /* timeOut */);
- assertNotNull(editInfoActivity);
- // The contacts tab index is 1
- assertEquals(1, editInfoActivity.getSelectedTabPosition());
+ assertThat(editInfoActivity).isNotNull();
+ assertThat(getInstrumentation().checkMonitorHit(activityMonitor, 1 /* minHits */)).isTrue();
editInfoActivity.finish();
}