merge in nyc-release history after reset to nyc-dev
diff --git a/res/drawable/ic_cake_black_24dp.xml b/res/drawable/ic_cake_black_24dp.xml
deleted file mode 100644
index 61ceba5..0000000
--- a/res/drawable/ic_cake_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="#61000000">
- <path
- android:pathData="M12,6c1.11,0 2,-0.9 2,-2 0,-0.38 -0.1,-0.73 -0.29,-1.03L12,0l-1.71,2.97c-0.19,0.3 -0.29,0.65 -0.29,1.03 0,1.1 0.9,2 2,2zM16.6,15.99l-1.07,-1.07 -1.08,1.07c-1.3,1.3 -3.58,1.31 -4.89,0l-1.07,-1.07 -1.09,1.07C6.75,16.64 5.88,17 4.96,17c-0.73,0 -1.4,-0.23 -1.96,-0.61L3,21c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-4.61c-0.56,0.38 -1.23,0.61 -1.96,0.61 -0.92,0 -1.79,-0.36 -2.44,-1.01zM18,9h-5L13,7h-2v2L6,9c-1.66,0 -3,1.34 -3,3v1.54c0,1.08 0.88,1.96 1.96,1.96 0.52,0 1.02,-0.2 1.38,-0.57l2.14,-2.13 2.13,2.13c0.74,0.74 2.03,0.74 2.77,0l2.14,-2.13 2.13,2.13c0.37,0.37 0.86,0.57 1.38,0.57 1.08,0 1.96,-0.88 1.96,-1.96L20.99,12C21,10.34 19.66,9 18,9z"
- android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/layout/preference_remove_dob_widget.xml b/res/layout/preference_remove_dob_widget.xml
deleted file mode 100644
index 0f15873..0000000
--- a/res/layout/preference_remove_dob_widget.xml
+++ /dev/null
@@ -1,31 +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.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="horizontal">
- <ImageView
- android:id="@+id/remove_dob"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:paddingStart="16dip"
- android:paddingEnd="16dip"
- android:src="@drawable/ic_clear_24dp"
- android:contentDescription="@string/remove_dob_icon_text"
- android:layout_gravity="center"
- android:background="?android:attr/selectableItemBackground" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/view_activity_layout.xml b/res/layout/view_activity_layout.xml
index be42fea..d68ecf4 100644
--- a/res/layout/view_activity_layout.xml
+++ b/res/layout/view_activity_layout.xml
@@ -39,15 +39,6 @@
android:lineSpacingMultiplier="1.05026"
android:textColor="#FFFFFF"/>
- <TextView
- android:id="@+id/personal_card_small"
- android:layout_width="wrap_content"
- android:layout_height="19dp"
- android:layout_marginStart="72dp"
- android:layout_marginTop="1dp"
- android:textColor="#FFFFFF"
- android:textSize="14sp" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="18dp"></LinearLayout>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index bd8cb5e..4ca89fa 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -75,7 +75,7 @@
<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>
@@ -91,7 +91,7 @@
<string name="remove_contact_icon_text" msgid="4576641386490101363">"পরিচিতি সরান"</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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f0ee0a3..1779899 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,14 +23,14 @@
<string name="name" msgid="4286267457738861977">"Jméno"</string>
<string name="unknown_name" msgid="2834802479170495056">"Neznámé"</string>
<string name="address" msgid="6449303483151189969">"Adresa"</string>
- <string name="unknown_address" msgid="4212576729941786121">"Neznámé"</string>
+ <string name="unknown_address" msgid="4212576729941786121">"Neznámá"</string>
<string name="date_of_birth" msgid="777979232444227891">"Datum narození"</string>
<string name="unknown_date_of_birth" msgid="7416355536916066758">"Neznámé"</string>
<string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
<string name="age" msgid="8327537794752630199">"Věk: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
<string name="remove_dob_icon_text" msgid="4413507180967999944">"Odstranit datum narození"</string>
<string name="blood_type" msgid="6947022772999974608">"Krevní skupina"</string>
- <string name="unknown_blood_type" msgid="6337228278125085668">"Neznámé"</string>
+ <string name="unknown_blood_type" msgid="6337228278125085668">"Neznámá"</string>
<string name="oplus" msgid="7759756742377867011">"O+"</string>
<string name="ominus" msgid="5227278501191741055">"O-"</string>
<string name="aplus" msgid="4982472245421753463">"A+"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 28b0907..6c695f3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -94,7 +94,7 @@
<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, pero cualquiera puede leerla desde el marcador de emergencia sin necesidad de desbloquear tu teléfono."</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="6775035037534954056">"No se proporcionó información de emergencia"</string>
<string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e876c51..d98b182 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -71,7 +71,7 @@
<string name="h_h" msgid="2183333409760379720">"Hh"</string>
<string name="allergies" msgid="2789200777539258165">"Alergias"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Desconocidas"</string>
- <string name="allergies_hint" msgid="5488918780522184147">"Por ejemplo, cacahuetes"</string>
+ <string name="allergies_hint" msgid="5488918780522184147">"Por ejemplo, nueces"</string>
<string name="medications" msgid="644428945685557183">"Medicación"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Desconocida"</string>
<string name="medications_hint" msgid="3221620025945593723">"Por ejemplo, aspirina"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d84812d..01209f2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -94,7 +94,7 @@
<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="user_emergency_info_consent" msgid="5636028073450797246">"اطلاعاتی که اینجا وارد میکنید میتواند در شرایط اضطراری به اولین افرادی که در صحنه حاضر میشوند راهنمایی کند. این اطلاعات فقط در دستگاهتان ذخیره میشود، و همه میتوانند بدون باز کردن قفل دستگاهتان، آن را از شمارهگیر اضطراری بخوانند."</string>
<string name="emergency_info_continue" msgid="5453201508537906087">"ادامه"</string>
<string name="no_info_provided" msgid="6775035037534954056">"اطلاعات اضطراری ارائه نشده است"</string>
<string name="clear_all" msgid="8899013032870561633">"پاک کردن همه"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 37ac904..a18b74b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -77,7 +77,7 @@
<string name="medications_hint" msgid="3221620025945593723">"Par exemple, aspirine"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Notes médicales"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Inconnues"</string>
- <string name="medical_conditions_hint" msgid="6959152183029062882">"Par exemple, l\'asthme"</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="yes" msgid="5829765567799916128">"Oui"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c96f4e4..ca938d5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -75,7 +75,7 @@
<string name="medications" msgid="644428945685557183">"Traitements médicamenteux"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Inconnus"</string>
<string name="medications_hint" msgid="3221620025945593723">"Par exemple, aspirine"</string>
- <string name="medical_conditions" msgid="3555690011498283592">"Notes médicales"</string>
+ <string name="medical_conditions" msgid="3555690011498283592">"Autres informations médicales"</string>
<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>
@@ -94,7 +94,7 @@
<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="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="6775035037534954056">"Aucune information d\'urgence fournie"</string>
<string name="clear_all" msgid="8899013032870561633">"Tout effacer"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3076c81..e743d8d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -71,7 +71,7 @@
<string name="h_h" msgid="2183333409760379720">"H H"</string>
<string name="allergies" msgid="2789200777539258165">"Allergie"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Sconosciute"</string>
- <string name="allergies_hint" msgid="5488918780522184147">"Ad esempio, agli arachidi"</string>
+ <string name="allergies_hint" msgid="5488918780522184147">"Ad esempio, arachidi"</string>
<string name="medications" msgid="644428945685557183">"Farmaci"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Sconosciuti"</string>
<string name="medications_hint" msgid="3221620025945593723">"Ad esempio, aspirina"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 76929f2..77eae6e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -31,14 +31,14 @@
<string name="remove_dob_icon_text" msgid="4413507180967999944">"הסר את תאריך הלידה"</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>
- <string name="aplus" msgid="4982472245421753463">"A+"</string>
- <string name="aminus" msgid="1469727296074783670">"-A"</string>
- <string name="bplus" msgid="5395850743718234762">"+B"</string>
- <string name="bminus" msgid="3813367242072886088">"-B"</string>
- <string name="abplus" msgid="8061792867513932701">"+AB"</string>
- <string name="abminus" msgid="2510867828094325481">"-AB"</string>
+ <string name="oplus" msgid="7759756742377867011">"O+"</string>
+ <string name="ominus" msgid="5227278501191741055">"O-"</string>
+ <string name="aplus" msgid="4982472245421753463">"A+"</string>
+ <string name="aminus" msgid="1469727296074783670">"A-"</string>
+ <string name="bplus" msgid="5395850743718234762">"B+"</string>
+ <string name="bminus" msgid="3813367242072886088">"B-"</string>
+ <string name="abplus" msgid="8061792867513932701">"AB+"</string>
+ <string name="abminus" msgid="2510867828094325481">"AB-"</string>
<string name="hh" msgid="3071675674015857183">"H/H"</string>
<!-- no translation found for blood_type_entries:0 (5051829403671092348) -->
<!-- no translation found for blood_type_entries:1 (5289547171251363498) -->
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index a8230a6..4938ecf 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="1090682794607161063">"Emergency Information"</string>
+ <string name="app_label" msgid="1090682794607161063">"Төтенше жағдайға арналған ақпарат"</string>
<string name="edit_info" msgid="5973929805855224805">"Төтенше жағдайға арналған ақпаратты өзгерту"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Ақпарат"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Контактілер"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 71e30be..1061453 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -16,15 +16,15 @@
<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="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="unknown_name" msgid="2834802479170495056">"មិនស្គាល់"</string>
<string name="address" msgid="6449303483151189969">"អាសយដ្ឋាន"</string>
<string name="unknown_address" msgid="4212576729941786121">"មិនស្គាល់"</string>
- <string name="date_of_birth" msgid="777979232444227891">"ថ្ងៃខែឆ្នាកំណើត"</string>
+ <string name="date_of_birth" msgid="777979232444227891">"ថ្ងៃខែឆ្នាំកំណើត"</string>
<string name="unknown_date_of_birth" msgid="7416355536916066758">"មិនស្គាល់"</string>
<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>
@@ -69,13 +69,13 @@
<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>
+ <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>
@@ -93,11 +93,11 @@
<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="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="6775035037534954056">"គ្មានការផ្តល់ព័ត៌មានសង្គ្រោះបន្ទាន់ទេ"</string>
+ <string name="no_info_provided" msgid="6775035037534954056">"គ្មានព័ត៌មានបន្ទាន់ទេ"</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-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 49ab652..e22298d 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -86,7 +86,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="remove_contact" msgid="6934983445723096759">"ತರ್ತು ಸಂಪರ್ಕಗಳಿಂದ <xliff:g id="CONTACT_NAME">%1$s</xliff:g> ಅವರನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"ಸಂಪರ್ಕ ತೆಗೆದುಹಾಕಿ"</string>
<string name="remove" msgid="1243949503772376064">"ತೆಗೆದುಹಾಕಿ"</string>
@@ -94,10 +94,10 @@
<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="user_emergency_info_consent" msgid="5636028073450797246">"ಇಲ್ಲಿ ನಮೂದಿಸುವ ಮಾಹಿತಿಯು ತುರ್ತುಪರಿಸ್ಥಿತಿಯಲ್ಲಿ ಮೊದಲು ಸಹಾಯಕ್ಕೆ ಬರುವವರಿಗೆ ಪ್ರಯೋಜನಕಾರಿಯಾಗಿರುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಸಂಗ್ರಹವಾಗಿರುತ್ತದೆ. ಇದನ್ನು ತುರ್ತು ಡಯಲರ್ನಲ್ಲಿ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡದೆಯೇ, ಯಾರು ಬೇಕಾದರೂ ಓದಬಹುದು."</string>
<string name="emergency_info_continue" msgid="5453201508537906087">"ಮುಂದುವರಿಸು"</string>
<string name="no_info_provided" msgid="6775035037534954056">"ಯಾವುದೇ ತುರ್ತು ಮಾಹಿತಿಯನ್ನು ಒದಗಿಸಲಾಗಿಲ್ಲ"</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>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 4c7474f..e474e6b 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -81,7 +81,7 @@
<string name="organ_donor" msgid="5953509460007124827">"ကိုယ်လက်အင်္ဂါ အလှူရှင်"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"မသိ"</string>
<string name="yes" msgid="5829765567799916128">"ဟုတ်ပါသည်"</string>
- <string name="no" msgid="1681689233660683509">"မဟုတ်ပါ"</string>
+ <string name="no" msgid="1681689233660683509">"No"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
@@ -94,10 +94,10 @@
<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="user_emergency_info_consent" msgid="5636028073450797246">"ဤနေရာတွင် သင်ထည့်သွင်းထားသည့် အချက်အလက်များသည် အရေးပေါ်အခြေအနေတွင် ပထမတုံ့ပြန်သူကို အကူအညီပေးနိုင်ပါမည်။ ၎င်းကို သင့်စက်ပစ္စည်းထဲတွင်သာ သိမ်းဆည်းထားခြင်းဖြစ်ပြီး၊ သင့်ဖုန်းကို လော့ခ်ဖွင့်စရာမလိုဘဲ မည်သူမဆို အရေးပေါ်ခလုတ်မှ ဖတ်နိုင်ပါသည်။"</string>
<string name="emergency_info_continue" msgid="5453201508537906087">"ရှေ့ဆက်ပါ"</string>
- <string name="no_info_provided" msgid="6775035037534954056">"အရေးပေါ်အချက်အလက်များ မပေးထားပါ"</string>
- <string name="clear_all" msgid="8899013032870561633">"အားလုံး ရှင်းလင်းပါ"</string>
- <string name="clear" msgid="3648880442502887163">"ရှင်းလင်းပါ"</string>
- <string name="clear_all_message" msgid="1548432000373861295">"အချက်အလက်များနှင့် အဆက်အသွယ်များအားလုံးကို ရှင်းမလား။"</string>
+ <string name="no_info_provided" msgid="6775035037534954056">"အရေးပေါ်အချက်အလက်များ ပေးမထားပါ"</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-nb/strings.xml b/res/values-nb/strings.xml
index a9916b4..b3ba209 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -94,7 +94,7 @@
<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. Informasjonen er bare lagret på enheten din, og hvem som helst kan lese den via alternativet for nødanrop uten å låse opp telefonen din."</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="6775035037534954056">"Informasjon for nødstilfeller er ikke oppgitt"</string>
<string name="clear_all" msgid="8899013032870561633">"Fjern alt"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 5038ea0..9428945 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -99,5 +99,5 @@
<string name="no_info_provided" msgid="6775035037534954056">"कुनै पनि आपतकालीन जानकारी प्रदान गरिएको छैन"</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-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 1f5b7af..618f582 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -29,7 +29,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>
@@ -77,7 +77,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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4babd6f..6c0fc4a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -98,6 +98,6 @@
<string name="emergency_info_continue" msgid="5453201508537906087">"Dalej"</string>
<string name="no_info_provided" msgid="6775035037534954056">"Brak informacji alarmowych"</string>
<string name="clear_all" msgid="8899013032870561633">"Wyczyść wszystko"</string>
- <string name="clear" msgid="3648880442502887163">"Wyczyść"</string>
+ <string name="clear" msgid="3648880442502887163">"Usuń"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Usunąć wszystkie informacje i kontakty?"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 721d966..f6c746a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -71,7 +71,7 @@
<string name="h_h" msgid="2183333409760379720">"H H"</string>
<string name="allergies" msgid="2789200777539258165">"Alergias"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Desconhecidas"</string>
- <string name="allergies_hint" msgid="5488918780522184147">"Por exemplo, amendoins"</string>
+ <string name="allergies_hint" msgid="5488918780522184147">"Por exemplo, ao amendoim"</string>
<string name="medications" msgid="644428945685557183">"Medicamentos"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Desconhecidos"</string>
<string name="medications_hint" msgid="3221620025945593723">"Por exemplo, aspirina"</string>
@@ -79,7 +79,7 @@
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Desconhecidas"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Por exemplo, asma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Dador de órgãos"</string>
- <string name="unknown_organ_donor" msgid="2780515342875494225">"Desconhecida"</string>
+ <string name="unknown_organ_donor" msgid="2780515342875494225">"Desconhecido"</string>
<string name="yes" msgid="5829765567799916128">"Sim"</string>
<string name="no" msgid="1681689233660683509">"Não"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f356841..014d973 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -25,7 +25,7 @@
<string name="address" msgid="6449303483151189969">"Endereço"</string>
<string name="unknown_address" msgid="4212576729941786121">"Desconhecido"</string>
<string name="date_of_birth" msgid="777979232444227891">"Data de nascimento"</string>
- <string name="unknown_date_of_birth" msgid="7416355536916066758">"Desconhecido"</string>
+ <string name="unknown_date_of_birth" msgid="7416355536916066758">"Desconhecida"</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">"Remove a data de nascimento"</string>
@@ -70,13 +70,13 @@
<string name="ab_negative" msgid="2064555613093591729">"AB negativo"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
<string name="allergies" msgid="2789200777539258165">"Alergias"</string>
- <string name="unknown_allergies" msgid="4383115953418061237">"Desconhecido"</string>
+ <string name="unknown_allergies" msgid="4383115953418061237">"Desconhecidas"</string>
<string name="allergies_hint" msgid="5488918780522184147">"Por exemplo, amendoim"</string>
<string name="medications" msgid="644428945685557183">"Medicamentos"</string>
- <string name="unknown_medications" msgid="2764171064510423734">"Desconhecido"</string>
+ <string name="unknown_medications" msgid="2764171064510423734">"Desconhecidos"</string>
<string name="medications_hint" msgid="3221620025945593723">"Por exemplo, aspirina"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Anotações médicas"</string>
- <string name="unknown_medical_conditions" msgid="8051364895172053770">"Desconhecido"</string>
+ <string name="unknown_medical_conditions" msgid="8051364895172053770">"Desconhecidas"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Por exemplo, asma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Doador de órgãos"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"Desconhecido"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 64f5149..4a8d0e1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="1090682794607161063">"Acil durum bilgisi"</string>
+ <string name="app_label" msgid="1090682794607161063">"Acil durum bilgileri"</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>
@@ -93,7 +93,7 @@
<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 bilgisi"</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="6775035037534954056">"Acil durum bilgisi yok"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 15fe2db..d54a139 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -17,10 +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">"Favqulodda axborot"</string>
- <string name="edit_info" msgid="5973929805855224805">"Favqulodda holatlar uchun zarur 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>
- <string name="name" msgid="4286267457738861977">"Ismi"</string>
+ <string name="name" msgid="4286267457738861977">"Ism"</string>
<string name="unknown_name" msgid="2834802479170495056">"Noma’lum"</string>
<string name="address" msgid="6449303483151189969">"Manzil"</string>
<string name="unknown_address" msgid="4212576729941786121">"Noma’lum"</string>
@@ -31,14 +31,14 @@
<string name="remove_dob_icon_text" msgid="4413507180967999944">"Tug‘ilgan kun sanasini o‘chirish"</string>
<string name="blood_type" msgid="6947022772999974608">"Qon guruhi"</string>
<string name="unknown_blood_type" msgid="6337228278125085668">"Noma’lum"</string>
- <string name="oplus" msgid="7759756742377867011">"I musbat"</string>
- <string name="ominus" msgid="5227278501191741055">"I manfiy"</string>
- <string name="aplus" msgid="4982472245421753463">"II musbat"</string>
- <string name="aminus" msgid="1469727296074783670">"II manfiy"</string>
- <string name="bplus" msgid="5395850743718234762">"III musbat"</string>
- <string name="bminus" msgid="3813367242072886088">"III manfiy"</string>
- <string name="abplus" msgid="8061792867513932701">"IV musbat"</string>
- <string name="abminus" msgid="2510867828094325481">"IV manfiy"</string>
+ <string name="oplus" msgid="7759756742377867011">"O(I) Rh+"</string>
+ <string name="ominus" msgid="5227278501191741055">"O(I) Rh−"</string>
+ <string name="aplus" msgid="4982472245421753463">"A(II) Rh+"</string>
+ <string name="aminus" msgid="1469727296074783670">"A(II) Rh−"</string>
+ <string name="bplus" msgid="5395850743718234762">"B(III) Rh+"</string>
+ <string name="bminus" msgid="3813367242072886088">"B(III) Rh-"</string>
+ <string name="abplus" msgid="8061792867513932701">"AB(IV) Rh+"</string>
+ <string name="abminus" msgid="2510867828094325481">"AB(IV) Rh-"</string>
<string name="hh" msgid="3071675674015857183">"H/H"</string>
<!-- no translation found for blood_type_entries:0 (5051829403671092348) -->
<!-- no translation found for blood_type_entries:1 (5289547171251363498) -->
@@ -72,13 +72,13 @@
<string name="allergies" msgid="2789200777539258165">"Allergiyalar"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Noma’lum"</string>
<string name="allergies_hint" msgid="5488918780522184147">"Masalan, yeryong‘oq"</string>
- <string name="medications" msgid="644428945685557183">"Dorilar"</string>
+ <string name="medications" msgid="644428945685557183">"Dori-darmon"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Noma’lum"</string>
<string name="medications_hint" msgid="3221620025945593723">"Masalan, aspirin"</string>
- <string name="medical_conditions" msgid="3555690011498283592">"Tibbiy ma’lumotlar"</string>
+ <string name="medical_conditions" msgid="3555690011498283592">"Tibbiy qaydlar"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Noma’lum"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Masalan, astma"</string>
- <string name="organ_donor" msgid="5953509460007124827">"Donor"</string>
+ <string name="organ_donor" msgid="5953509460007124827">"Organ donori"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"Noma’lum"</string>
<string name="yes" msgid="5829765567799916128">"Ha"</string>
<string name="no" msgid="1681689233660683509">"Yo‘q"</string>
@@ -93,11 +93,11 @@
<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 holatlar uchun zarur ma’lumotlar"</string>
- <string name="user_emergency_info_consent" msgid="5636028073450797246">"Bu yerda kiritiladigan ma’lumotlar favqulodda holatlarda birinchi javob beruvchi uchun yordam beradi. Bu ma’lumotlar faqatgina qurilmangizda saqlanadi hamda telefonni qulfdan chiqarmasdan turib favqulodda raqam tergichdan hamma o‘qiy oladi."</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="6775035037534954056">"Hech qanday favqulodda axborot taqdim etilmagan"</string>
- <string name="clear_all" msgid="8899013032870561633">"Hammasini tozalash"</string>
- <string name="clear" msgid="3648880442502887163">"Tozalash"</string>
- <string name="clear_all_message" msgid="1548432000373861295">"Barcha ma’lumotlar va kontaktlar tozalansinmi?"</string>
+ <string name="no_info_provided" msgid="6775035037534954056">"Favqulodda vaziyatlar uchun hech qanday axborot yo‘q"</string>
+ <string name="clear_all" msgid="8899013032870561633">"Hammasini o‘chirish"</string>
+ <string name="clear" msgid="3648880442502887163">"O‘chirish"</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"Barcha kontaktlar va ma’lumotlar o‘chirib tashlansinmi?"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2fc205a..de826ca 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,4 +20,5 @@
<color name="tab_text_color">#FFFFFF</color>
<color name="material_teal_200">#FF80CBC4</color>
<color name="white_with_alpha">#B2FFFFFF</color>
+ <color name="hint_text_color">#36000000</color>
</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 73c5891..0789306 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,7 +18,7 @@
<item name="android:preferenceCategoryStyle">@style/AppTheme.PreferenceCategoryStyle</item>
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
- <item name="colorAccent">@color/material_teal_200</item>
+ <item name="tabIndicatorColor">@color/material_teal_200</item>
<item name="android:datePickerStyle">@style/AppTheme.DatePickerStyle</item>
</style>
<!-- Base emergency theme. -->
@@ -27,12 +27,14 @@
<item name="colorPrimaryDark">@color/emergency_primary_dark</item>
<item name="colorPrimary">@color/emergency_primary</item>
<item name="colorAccent">@color/emergency_accent</item>
+ <item name="tabIndicatorColor">@color/emergency_accent</item>
</style>
<!-- Tabs -->
<style name="AppTheme.TabLayout" parent="Widget.Design.TabLayout">
<item name="tabTextAppearance">@style/AppTheme.TabText</item>
<item name="tabSelectedTextColor">@color/tab_text_color</item>
+ <item name="tabIndicatorColor">?attr/tabIndicatorColor</item>
<item name="tabIndicatorHeight">2dp</item>
<item name="tabPaddingStart">24dp</item>
<item name="tabPaddingEnd">24dp</item>
diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index d6ae6de..2cb8ca7 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -22,12 +22,6 @@
android:summary="@string/unknown_name"
android:title="@string/name" />
- <com.android.emergency.preferences.BirthdayPreference
- android:icon="@drawable/ic_cake_black_24dp"
- android:key="date_of_birth"
- android:summary="@string/unknown_date_of_birth"
- android:title="@string/date_of_birth" />
-
<com.android.emergency.preferences.EmergencyEditTextPreference
android:icon="@drawable/ic_address_black_24dp"
android:inputType="textCapWords|textPostalAddress|textMultiLine"
@@ -52,6 +46,7 @@
<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"
@@ -62,6 +57,7 @@
<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"
@@ -83,6 +79,7 @@
<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"
diff --git a/src/com/android/emergency/PreferenceKeys.java b/src/com/android/emergency/PreferenceKeys.java
index 5e2c2bf..0592281 100644
--- a/src/com/android/emergency/PreferenceKeys.java
+++ b/src/com/android/emergency/PreferenceKeys.java
@@ -29,9 +29,6 @@
/** Key to store and read the name of the user. */
public static final String KEY_NAME = "name";
- /** Key to store and read the date of birth of the user. */
- public static final String KEY_DATE_OF_BIRTH = "date_of_birth";
-
/** Key to store and read the address of the user. */
public static final String KEY_ADDRESS = "address";
@@ -56,7 +53,7 @@
* <p>Note: Do not change the order of these keys, since the order is used to collect TRON stats
*/
public static final String[] KEYS_EDIT_EMERGENCY_INFO = {KEY_NAME, KEY_ADDRESS,
- KEY_DATE_OF_BIRTH, KEY_BLOOD_TYPE, KEY_ALLERGIES, KEY_MEDICATIONS,
+ KEY_BLOOD_TYPE, KEY_ALLERGIES, KEY_MEDICATIONS,
KEY_MEDICAL_CONDITIONS, KEY_ORGAN_DONOR};
/** Keys for all viewable emergency info preferences */
diff --git a/src/com/android/emergency/edit/EditEmergencyInfoFragment.java b/src/com/android/emergency/edit/EditEmergencyInfoFragment.java
index 042142d..bc10c59 100644
--- a/src/com/android/emergency/edit/EditEmergencyInfoFragment.java
+++ b/src/com/android/emergency/edit/EditEmergencyInfoFragment.java
@@ -16,18 +16,14 @@
package com.android.emergency.edit;
import android.app.Fragment;
-import android.content.Context;
-import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
import android.text.TextUtils;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
import com.android.emergency.ReloadablePreferenceInterface;
-import com.android.emergency.preferences.BirthdayPreference;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -48,26 +44,13 @@
preference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object value) {
- boolean notSet;
- if (!preference.getKey().equals(PreferenceKeys.KEY_DATE_OF_BIRTH)) {
- notSet = TextUtils.isEmpty((String) value);
- } else {
- if (value instanceof Long) {
- notSet = BirthdayPreference.DEFAULT_UNSET_VALUE == ((Long) value);
- } else {
- // Protect against b/27946460: We used to store the date of birth as a
- // string. If it is a string, ignore its value. If it is not a string
- // it will throw a ClassCastException
- String strValue = (String) value;
- notSet = true;
- }
- }
+ boolean notSet = TextUtils.isEmpty((String) value);
// 0 is the default subtype. In DP1 and DP2 we had no explicit subtype.
- // Start at 10 to differentiate between before and after.
+ // Start at 30 to differentiate between before and after.
MetricsLogger.action(
preference.getContext(),
MetricsEvent.ACTION_EDIT_EMERGENCY_INFO_FIELD,
- 10 + index * 2 + (notSet ? 0 : 1));
+ 30 + index * 2 + (notSet ? 0 : 1));
return true;
}
});
diff --git a/src/com/android/emergency/preferences/BirthdayPreference.java b/src/com/android/emergency/preferences/BirthdayPreference.java
deleted file mode 100644
index a994e9a..0000000
--- a/src/com/android/emergency/preferences/BirthdayPreference.java
+++ /dev/null
@@ -1,264 +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.preferences;
-
-import android.app.DatePickerDialog;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.Preference;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.DatePicker;
-
-import com.android.emergency.PreferenceKeys;
-import com.android.emergency.R;
-import com.android.emergency.ReloadablePreferenceInterface;
-import com.android.internal.annotations.VisibleForTesting;
-
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * A base class for {@link Preference} to select a date of birth upon it being clicked. Internally
- * the date of birth is stored as the UTC time in milliseconds at the beginning of the day.
- *
- * <p>The user should pass a String as a default value for the date in milliseconds in UTC time.
- */
-public class BirthdayPreference extends Preference implements DatePickerDialog.OnDateSetListener,
- ReloadablePreferenceInterface {
- /** Default value used when no date of birth is set. */
- public static final long DEFAULT_UNSET_VALUE = Long.MIN_VALUE;
- private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone("UTC");
-
- private final DatePickerDialog mDatePickerDialog;
- private long mDateTimeMillis;
- private boolean mDateSet;
- private final DateFormat mDateFormat;
-
- /** Creates a new instance initialized with {@code context} and {@code attrs}. */
- public BirthdayPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- mDateTimeMillis = DEFAULT_UNSET_VALUE;
- mDateFormat = DateFormat.getDateInstance();
- mDateFormat.setTimeZone(UTC_TIME_ZONE);
- // Calendar.getInstance() uses default locale
- final Calendar calendar = Calendar.getInstance();
- mDatePickerDialog = new DatePickerDialog(
- context,
- this,
- calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH),
- calendar.get(Calendar.DAY_OF_MONTH));
- mDatePickerDialog.setTitle(getTitle());
- setOnPreferenceClickListener(new OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- showDatePickerDialog(null);
- return true;
- }
- });
- setWidgetLayoutResource(R.layout.preference_remove_dob_widget);
- }
-
- @Override
- protected void onBindView(View view) {
- super.onBindView(view);
- View removeDateOfBirth = view.findViewById(R.id.remove_dob);
- if (!isSelectable() || isNotSet()) {
- removeDateOfBirth.setVisibility(View.GONE);
- } else {
- removeDateOfBirth.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- if (callChangeListener(DEFAULT_UNSET_VALUE)) {
- setDateOfBirth(DEFAULT_UNSET_VALUE);
- }
- }
- });
- }
- }
-
- private void showDatePickerDialog(Bundle state) {
- if (state != null) {
- mDatePickerDialog.onRestoreInstanceState(state);
- }
- if (!isNotSet()) {
- Calendar calendar = Calendar.getInstance(UTC_TIME_ZONE);
- calendar.setTimeInMillis(mDateTimeMillis);
- mDatePickerDialog.updateDate(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH),
- calendar.get(Calendar.DAY_OF_MONTH));
- }
- mDatePickerDialog.show();
- }
-
- @Override
- protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue) {
- setDateOfBirth(restorePersistedValue ? getPersistedLong(DEFAULT_UNSET_VALUE)
- : (Long) defaultValue);
- }
-
- @Override
- public void reloadFromPreference() {
- setDateOfBirth(getPersistedLong(DEFAULT_UNSET_VALUE));
- }
-
-
- @Override
- public boolean isNotSet() {
- return mDateTimeMillis == DEFAULT_UNSET_VALUE;
- }
-
- /**
- * Returns the date of birth in milliseconds in UTC time.
- */
- @VisibleForTesting
- public long getDateOfBirth() {
- return mDateTimeMillis;
- }
-
- @Override
- public void onDateSet(DatePicker view, int year, int month, int day) {
- Calendar calendar = Calendar.getInstance(UTC_TIME_ZONE);
- calendar.clear(); // Clears hour, minutes and seconds
- calendar.set(year, month, day);
- long dateTimeInMillis = calendar.getTimeInMillis();
- if (callChangeListener(dateTimeInMillis)) {
- setDateOfBirth(dateTimeInMillis);
- }
- }
-
- @Override
- protected Object onGetDefaultValue(TypedArray a, int index) {
- String longValueAsStr = a.getString(index);
- if (TextUtils.isEmpty(longValueAsStr)) {
- return DEFAULT_UNSET_VALUE;
- }
- return Long.parseLong(longValueAsStr);
- }
-
- @Override
- public CharSequence getSummary() {
- if (isNotSet()) {
- return super.getSummary();
- } else {
- return mDateFormat.format(new Date(mDateTimeMillis));
- }
- }
-
- /**
- * Sets the date of birth in millis in UTC time.
- */
- @VisibleForTesting
- public void setDateOfBirth(long dateTimeMillis) {
- // Always persist/notify the first time.
- final boolean changed = mDateTimeMillis != dateTimeMillis;
- if (changed || !mDateSet) {
- mDateSet = true;
- mDateTimeMillis = dateTimeMillis;
- persistLong(mDateTimeMillis);
- if(changed) {
- notifyChanged();
- }
- }
- }
-
- @Override
- protected Parcelable onSaveInstanceState() {
- final Parcelable superState = super.onSaveInstanceState();
- if (mDatePickerDialog == null || !mDatePickerDialog.isShowing()) {
- return superState;
- }
-
- final SavedState myState = new SavedState(superState);
- myState.isDialogShowing = true;
- myState.dialogBundle = mDatePickerDialog.onSaveInstanceState();
- return myState;
- }
-
- @Override
- protected void onRestoreInstanceState(Parcelable state) {
- if (state == null || !state.getClass().equals(SavedState.class)) {
- // Didn't save state for us in onSaveInstanceState
- super.onRestoreInstanceState(state);
- return;
- }
-
- SavedState myState = (SavedState) state;
- super.onRestoreInstanceState(myState.getSuperState());
- if (myState.isDialogShowing) {
- showDatePickerDialog(myState.dialogBundle);
- }
- }
-
- @Override
- protected long getPersistedLong(long defaultReturnValue) {
- try {
- return super.getPersistedLong(defaultReturnValue);
- } catch (ClassCastException e) {
- // Protect against b/27946460: We used to store the date of birth as a
- // string. If it is a string, ignore its value. If it is not a string it will throw
- // a ClassCastException
- getPersistedString("");
-
- return defaultReturnValue;
- }
- }
-
- @VisibleForTesting
- public DatePickerDialog getDatePickerDialog() {
- return mDatePickerDialog;
- }
-
- private static class SavedState extends BaseSavedState {
- boolean isDialogShowing;
- Bundle dialogBundle;
-
- public SavedState(Parcel source) {
- super(source);
- isDialogShowing = source.readInt() == 1;
- dialogBundle = source.readBundle();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
- dest.writeInt(isDialogShowing ? 1 : 0);
- dest.writeBundle(dialogBundle);
- }
-
- public SavedState(Parcelable superState) {
- super(superState);
- }
-
- public static final Parcelable.Creator<SavedState> CREATOR =
- new Parcelable.Creator<SavedState>() {
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
-
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
- }
-}
\ No newline at end of file
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index c7b711d..639c283 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -21,10 +21,7 @@
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.TabLayout;
-import android.text.Spannable;
-import android.text.SpannableString;
import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
import android.util.Pair;
import android.view.Menu;
import android.view.MenuInflater;
@@ -39,28 +36,20 @@
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
import com.android.emergency.edit.EditInfoActivity;
-import com.android.emergency.preferences.BirthdayPreference;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import java.text.DateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
/**
* Activity for viewing emergency information.
*/
public class ViewInfoActivity extends EmergencyTabActivity {
private TextView mPersonalCardLargeItem;
- private TextView mPersonalCardSmallItem;
private SharedPreferences mSharedPreferences;
private LinearLayout mPersonalCard;
private ViewFlipper mViewFlipper;
- private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone("UTC");
- private DateFormat mDateFormat;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -70,72 +59,28 @@
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
mPersonalCard = (LinearLayout) findViewById(R.id.name_and_dob_linear_layout);
mPersonalCardLargeItem = (TextView) findViewById(R.id.personal_card_large);
- mPersonalCardSmallItem = (TextView) findViewById(R.id.personal_card_small);
mViewFlipper = (ViewFlipper) findViewById(R.id.view_flipper);
- mDateFormat = DateFormat.getDateInstance();
- mDateFormat.setTimeZone(UTC_TIME_ZONE);
-
MetricsLogger.visible(this, MetricsEvent.ACTION_VIEW_EMERGENCY_INFO);
}
@Override
public void onResume() {
super.onResume();
- loadProfileCard();
+ loadName();
// Update the tabs: new info might have been added/deleted from the edit screen that
// could lead to adding/removing a fragment
setupTabs();
maybeHideTabs();
}
- private void loadProfileCard() {
- // Name
+ private void loadName() {
String name = mSharedPreferences.getString(PreferenceKeys.KEY_NAME, "");
- boolean nameEmpty = TextUtils.isEmpty(name);
-
- // Date of birth
- long dateOfBirthTimeMillis = BirthdayPreference.DEFAULT_UNSET_VALUE;
- try {
- dateOfBirthTimeMillis = mSharedPreferences.getLong(PreferenceKeys.KEY_DATE_OF_BIRTH,
- BirthdayPreference.DEFAULT_UNSET_VALUE);
- } catch (ClassCastException e) {
- // Protect against b/27946460: We used to store the date of birth as a string.
- // If it is a string, ignore its value. If it is not a string it will throw
- // a ClassCastException
- mSharedPreferences.getString(PreferenceKeys.KEY_DATE_OF_BIRTH, "");
- }
- boolean dateOfBirthNotSet = dateOfBirthTimeMillis == BirthdayPreference.DEFAULT_UNSET_VALUE;
-
- // Load the cards
- if (nameEmpty && dateOfBirthNotSet) {
+ if (TextUtils.isEmpty(name)) {
mPersonalCard.setVisibility(View.GONE);
} else {
mPersonalCard.setVisibility(View.VISIBLE);
- if (!dateOfBirthNotSet) {
- mPersonalCardSmallItem.setVisibility(View.VISIBLE);
- int age = computeAge(dateOfBirthTimeMillis);
- String localizedDob = String.format(getString(R.string.dob),
- mDateFormat.format(new Date(dateOfBirthTimeMillis)));
- Spannable spannableDob = new SpannableString(localizedDob);
- spannableDob.setSpan(new ForegroundColorSpan(
- getResources().getColor(R.color.white_with_alpha)), 0,
- localizedDob.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- if (nameEmpty) {
- // Display date of birth info in two lines: age and then date of birth
- mPersonalCardLargeItem.setText(String.format(getString(R.string.age), age));
- mPersonalCardSmallItem.setText(spannableDob);
- } else {
- mPersonalCardLargeItem.setText(name);
- mPersonalCardSmallItem.setText(String.format(getString(R.string.age), age));
- mPersonalCardSmallItem.append(" ");
- mPersonalCardSmallItem.append(spannableDob);
- }
- } else {
- mPersonalCardSmallItem.setVisibility(View.GONE);
- mPersonalCardLargeItem.setText(name);
- mPersonalCardSmallItem.setText("");
- }
+ mPersonalCardLargeItem.setText(name);
}
}
@@ -156,25 +101,6 @@
}
}
- private static int computeAge(long dateOfBirthTimeMillis) {
- Calendar today = Calendar.getInstance(UTC_TIME_ZONE);
- Calendar dateOfBirthCalendar = Calendar.getInstance(UTC_TIME_ZONE);
- dateOfBirthCalendar.setTimeInMillis(dateOfBirthTimeMillis);
- return computeAge(today, dateOfBirthCalendar);
- }
-
- static int computeAge(Calendar today, Calendar dateOfBirthCalendar) {
- int age = today.get(Calendar.YEAR) - dateOfBirthCalendar.get(Calendar.YEAR);
- if (today.get(Calendar.MONTH) < dateOfBirthCalendar.get(Calendar.MONTH) ||
- (today.get(Calendar.MONTH) == dateOfBirthCalendar.get(Calendar.MONTH) &&
- today.get(Calendar.DAY_OF_MONTH) <
- dateOfBirthCalendar.get(Calendar.DAY_OF_MONTH))) {
- age--;
- }
- // Return 0 if the user specifies a date of birth in the future.
- return Math.max(0, age);
- }
-
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
diff --git a/tests/src/com/android/emergency/edit/EditInfoActivityTest.java b/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
index 759ad91..be0b6c7 100644
--- a/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
+++ b/tests/src/com/android/emergency/edit/EditInfoActivityTest.java
@@ -29,7 +29,6 @@
import com.android.emergency.ContactTestUtils;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
-import com.android.emergency.preferences.BirthdayPreference;
import com.android.emergency.preferences.EmergencyContactsPreference;
import com.android.emergency.preferences.EmergencyEditTextPreference;
import com.android.emergency.preferences.EmergencyListPreference;
@@ -90,9 +89,6 @@
final NameAutoCompletePreference namePreference =
(NameAutoCompletePreference) mEditEmergencyInfoFragment
.findPreference(PreferenceKeys.KEY_NAME);
- final BirthdayPreference dateOfBirthPreference =
- (BirthdayPreference) mEditEmergencyInfoFragment
- .findPreference(PreferenceKeys.KEY_DATE_OF_BIRTH);
final EmergencyEditTextPreference addressPreference =
(EmergencyEditTextPreference) mEditEmergencyInfoFragment
.findPreference(PreferenceKeys.KEY_ADDRESS);
@@ -124,7 +120,6 @@
@Override
public void run() {
namePreference.setText("John");
- dateOfBirthPreference.setDateOfBirth(123456L);
addressPreference.setText("Home");
bloodTypePreference.setValue("A+");
allergiesPreference.setText("Peanuts");
@@ -136,8 +131,6 @@
});
String unknownName = editInfoActivity.getResources().getString(R.string.unknown_name);
- String unknownDateOfBirth =
- editInfoActivity.getResources().getString(R.string.unknown_date_of_birth);
String unknownAddress = getActivity().getResources().getString(R.string.unknown_address);
String unknownBloodType =
editInfoActivity.getResources().getString(R.string.unknown_blood_type);
@@ -151,7 +144,6 @@
editInfoActivity.getResources().getString(R.string.unknown_organ_donor);
assertNotSame(unknownName, namePreference.getSummary());
- assertNotSame(unknownDateOfBirth, dateOfBirthPreference.getSummary());
assertNotSame(unknownAddress, addressPreference.getSummary());
assertNotSame(unknownBloodType, bloodTypePreference.getSummary());
assertNotSame(unknownAllergies, allergiesPreference.getSummary());
@@ -186,7 +178,6 @@
getInstrumentation().waitForIdleSync();
assertEquals(unknownName, namePreference.getSummary());
- assertEquals(unknownDateOfBirth, dateOfBirthPreference.getSummary());
assertEquals(unknownAddress, addressPreference.getSummary());
assertEquals(unknownBloodType, bloodTypePreference.getSummary().toString());
assertEquals(unknownAllergies, allergiesPreference.getSummary());
diff --git a/tests/src/com/android/emergency/preferences/BirthdayPreferenceTest.java b/tests/src/com/android/emergency/preferences/BirthdayPreferenceTest.java
deleted file mode 100644
index 1cbdaab..0000000
--- a/tests/src/com/android/emergency/preferences/BirthdayPreferenceTest.java
+++ /dev/null
@@ -1,198 +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.preferences;
-
-import android.app.DatePickerDialog;
-import android.content.DialogInterface;
-import android.preference.PreferenceManager;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.view.View;
-
-import com.android.emergency.PreferenceKeys;
-import com.android.emergency.R;
-import com.android.emergency.edit.EditEmergencyInfoFragment;
-import com.android.emergency.edit.EditInfoActivity;
-
-/**
- * Tests for {@link BirthdayPreference}.
- */
-@LargeTest
-public class BirthdayPreferenceTest extends ActivityInstrumentationTestCase2<EditInfoActivity> {
-
- private BirthdayPreference mBirthdayPreference;
- private EditEmergencyInfoFragment mEditInfoFragment;
-
- public BirthdayPreferenceTest() {
- super(EditInfoActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mEditInfoFragment = (EditEmergencyInfoFragment) getActivity().getFragments().get(0).second;
- mBirthdayPreference = (BirthdayPreference)
- mEditInfoFragment.findPreference(PreferenceKeys.KEY_DATE_OF_BIRTH);
- try {
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mBirthdayPreference.setDateOfBirth(BirthdayPreference.DEFAULT_UNSET_VALUE);
- }
- });
- } catch (Throwable throwable) {
- fail("Should not throw exception");
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- PreferenceManager.getDefaultSharedPreferences(getActivity()).edit().clear().commit();
- super.tearDown();
- }
-
- public void testGetSummary() {
- String summary = (String) mBirthdayPreference.getSummary();
- String summaryExp = getActivity().getResources().getString(R.string.unknown_date_of_birth);
- assertEquals(summaryExp, summary);
- }
-
- public void testGetTitle() {
- CharSequence title = mBirthdayPreference.getTitle();
- String titleExp = getActivity().getResources().getString(R.string.date_of_birth);
- assertEquals(titleExp, title);
- }
-
- public void testProperties() {
- assertNotNull(mBirthdayPreference);
- assertEquals(PreferenceKeys.KEY_DATE_OF_BIRTH, mBirthdayPreference.getKey());
- assertTrue(mBirthdayPreference.isEnabled());
- assertTrue(mBirthdayPreference.isPersistent());
- assertTrue(mBirthdayPreference.isSelectable());
- assertTrue(mBirthdayPreference.isNotSet());
- assertEquals(BirthdayPreference.DEFAULT_UNSET_VALUE, mBirthdayPreference.getDateOfBirth());
- }
-
- public void testSetDate() throws Throwable {
- final long dateMs = 123456600L;
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mBirthdayPreference.setDateOfBirth(dateMs);
- }
- });
- assertEquals(dateMs, mBirthdayPreference.getDateOfBirth());
- assertFalse(mBirthdayPreference.isNotSet());
- assertEquals(dateMs, mBirthdayPreference.getSharedPreferences()
- .getLong(mBirthdayPreference.getKey(), 0));
- assertNotSame(getActivity().getResources().getString(R.string.unknown_date_of_birth),
- mBirthdayPreference.getSummary());
- }
-
- public void testSetDate_fromDatePicker() throws Throwable {
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- // 9th of January 1987
- mBirthdayPreference.onDateSet(null /* view*/, 1987, 0, 9);
- }
- });
- assertEquals(537148800000L, mBirthdayPreference.getDateOfBirth());
- }
-
- public void testDialogShowAndDismiss_positiveButton() throws Throwable {
- final DatePickerDialog datePickerDialog = mBirthdayPreference.getDatePickerDialog();
- assertFalse(datePickerDialog.isShowing());
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mBirthdayPreference.getOnPreferenceClickListener()
- .onPreferenceClick(mBirthdayPreference);
- }
- });
- assertTrue(datePickerDialog.isShowing());
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- datePickerDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
- }
- });
- getInstrumentation().waitForIdleSync();
- assertFalse(datePickerDialog.isShowing());
- }
-
- public void testDialogShowAndDismiss_negativeButton() throws Throwable {
- final DatePickerDialog datePickerDialog = mBirthdayPreference.getDatePickerDialog();
- assertFalse(datePickerDialog.isShowing());
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mBirthdayPreference.getOnPreferenceClickListener()
- .onPreferenceClick(mBirthdayPreference);
- }
- });
- assertTrue(datePickerDialog.isShowing());
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- datePickerDialog.getButton(DialogInterface.BUTTON_NEGATIVE).performClick();
- }
- });
- getInstrumentation().waitForIdleSync();
- assertFalse(datePickerDialog.isShowing());
- }
-
- public void testReloadFromPreference() throws Throwable {
- long dateMs = 123456600L;
- mBirthdayPreference.getSharedPreferences().edit()
- .putLong(mBirthdayPreference.getKey(), dateMs).commit();
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mBirthdayPreference.reloadFromPreference();
- }
-
- });
- assertEquals(dateMs, mBirthdayPreference.getDateOfBirth());
- }
-
- public void testWidgetClearsDate() throws Throwable {
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- mBirthdayPreference.setDateOfBirth(12345L);
- }
- });
- getInstrumentation().waitForIdleSync();
- assertEquals(12345L, mBirthdayPreference.getDateOfBirth());
-
- // Make the widget visible manually.
- // TODO: For some reason, the test doesn't call onBindView when the date is set and
- // notifyChanged() is called. Investigate this.
- View datePreferenceView = mBirthdayPreference.getView(null, null);
- final View removeDob = datePreferenceView.findViewById(R.id.remove_dob);
- removeDob.setVisibility(View.VISIBLE);
-
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- removeDob.performClick();
- }
- });
- getInstrumentation().waitForIdleSync();
- assertEquals(mBirthdayPreference.DEFAULT_UNSET_VALUE, mBirthdayPreference.getDateOfBirth());
- }
-}
\ No newline at end of file
diff --git a/tests/src/com/android/emergency/view/ViewInfoActivityTest.java b/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
index 7d3f2b9..3c5b2f1 100644
--- a/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
+++ b/tests/src/com/android/emergency/view/ViewInfoActivityTest.java
@@ -47,7 +47,6 @@
private ArrayList<Pair<String, Fragment>> mFragments;
private LinearLayout mPersonalCard;
private TextView mPersonalCardLargeItem;
- private TextView mPersonalCardSmallItem;
private ViewFlipper mViewFlipper;
private int mNoInfoIndex;
private int mTabsIndex;
@@ -61,7 +60,6 @@
super.setUp();
mPersonalCard = (LinearLayout) getActivity().findViewById(R.id.name_and_dob_linear_layout);
mPersonalCardLargeItem = (TextView) getActivity().findViewById(R.id.personal_card_large);
- mPersonalCardSmallItem = (TextView) getActivity().findViewById(R.id.personal_card_small);
mViewFlipper = (ViewFlipper) getActivity().findViewById(R.id.view_flipper);
mNoInfoIndex = mViewFlipper
.indexOfChild(getActivity().findViewById(R.id.no_info_text_view));
@@ -104,24 +102,6 @@
assertEquals(mNoInfoIndex, mViewFlipper.getDisplayedChild());
assertEquals(View.VISIBLE, mPersonalCardLargeItem.getVisibility());
assertEquals(name, mPersonalCardLargeItem.getText());
- assertEquals(View.GONE, mPersonalCardSmallItem.getVisibility());
- }
-
- public void testDateOfBirthSet() throws Throwable {
- onPause();
-
- final long dateOfBirth = 537148800000L;
- PreferenceManager.getDefaultSharedPreferences(getActivity())
- .edit().putLong(PreferenceKeys.KEY_DATE_OF_BIRTH, dateOfBirth).commit();
-
- onResume();
-
- mFragments = getActivity().getFragments();
- assertEquals(0, mFragments.size());
- assertEquals(View.GONE, getActivity().getTabLayout().getVisibility());
- assertEquals(mNoInfoIndex, mViewFlipper.getDisplayedChild());
- assertEquals(View.VISIBLE, mPersonalCardLargeItem.getVisibility());
- assertEquals(View.VISIBLE, mPersonalCardSmallItem.getVisibility());
}
public void testEmergencyInfoSet() throws Throwable {
@@ -195,35 +175,6 @@
"John", "123"));
}
- public void testComputeAge() {
- Calendar today = Calendar.getInstance();
- Calendar dateOfBirth = Calendar.getInstance();
-
- today.set(2016, 1, 9);
- dateOfBirth.set(1987, 1, 9);
- assertEquals(29, ViewInfoActivity.computeAge(today, dateOfBirth));
-
- // One day before birthday
- today.set(2016, 1, 8);
- dateOfBirth.set(1987, 1, 9);
- assertEquals(28, ViewInfoActivity.computeAge(today, dateOfBirth));
-
- // One month before birthday
- today.set(2016, 0, 9);
- dateOfBirth.set(1987, 1, 9);
- assertEquals(28, ViewInfoActivity.computeAge(today, dateOfBirth));
-
- // Today is same day as birthday
- today.set(2016, 1, 9);
- dateOfBirth.set(2016, 1, 9);
- assertEquals(0, ViewInfoActivity.computeAge(today, dateOfBirth));
-
- // Today is before birthday
- today.set(2013, 4, 17);
- dateOfBirth.set(2016, 1, 9);
- assertEquals(0, ViewInfoActivity.computeAge(today, dateOfBirth));
- }
-
public void testCanGoToEditInfoActivityFromMenu() {
final ViewInfoActivity activity = getActivity();
