DO NOT MERGE - Mark RQ2A.210105.001 as merged.
Bug: 180401296
Merged-In: I81fcdc717564d4692720e2d55be8e11ea997e9cf
Change-Id: I97e6de2a60d681c966b4d458c23ef36b717d10ae
diff --git a/Android.bp b/Android.bp
index d2de99b..b77493e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_app {
name: "EmergencyInfo",
platform_apis: true,
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43f6644..fc85893 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,46 +13,58 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.emergency"
- android:sharedUserId="com.android.emergency.uid">
- <uses-permission android:name="android.permission.CALL_PHONE" />
- <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.MANAGE_USERS" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.emergency"
+ android:sharedUserId="com.android.emergency.uid">
+
+ <uses-permission android:name="android.permission.CALL_PHONE"/>
+ <uses-permission android:name="android.permission.CALL_PRIVILEGED"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.MANAGE_USERS"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
<uses-sdk android:minSdkVersion="21"/>
- <application
- android:defaultToDeviceProtectedStorage="true"
- android:icon="@mipmap/ic_local_hospital_24dp"
- android:directBootAware="true"
- android:label="@string/app_label"
- android:supportsRtl="true">
- <activity
- android:name=".view.ViewInfoActivity"
- android:theme="@style/AppThemeEmergency"
- android:taskAffinity="com.android.settings"
- android:showWhenLocked="true"
- android:icon="@drawable/ic_launcher_settings"
- android:launchMode="singleTask">
+ <queries>
+ <!-- Needed to take photos as user avatar in Medical info UI -->
+ <intent>
+ <action android:name="android.media.action.IMAGE_CAPTURE" />
+ </intent>
+ <!-- Needed to edit images as user avatar in Medical info UI -->
+ <intent>
+ <action android:name="android.intent.action.GET_CONTENT" />
+ <data android:mimeType="image/*" />
+ </intent>
+ </queries>
+
+ <application android:defaultToDeviceProtectedStorage="true"
+ android:icon="@mipmap/ic_local_hospital_24dp"
+ android:directBootAware="true"
+ android:label="@string/app_label"
+ android:supportsRtl="true">
+ <activity android:name=".view.ViewInfoActivity"
+ android:theme="@style/AppThemeEmergency"
+ android:taskAffinity="com.android.settings"
+ android:showWhenLocked="true"
+ android:icon="@drawable/ic_launcher_settings"
+ android:launchMode="singleTask"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.action.EMERGENCY_ASSISTANCE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.telephony.action.EMERGENCY_ASSISTANCE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity
- android:name=".edit.EditInfoActivity"
- android:icon="@drawable/ic_launcher_settings"
- android:theme="@style/AppTheme"
- android:taskAffinity="com.android.settings"
- android:launchMode="singleTask">
+ <activity android:name=".edit.EditInfoActivity"
+ android:icon="@drawable/ic_launcher_settings"
+ android:theme="@style/AppTheme"
+ android:taskAffinity="com.android.settings"
+ android:launchMode="singleTask"
+ android:exported="true">
<intent-filter>
- <action android:name="android.settings.EDIT_EMERGENCY_INFO" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.settings.EDIT_EMERGENCY_INFO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
@@ -60,7 +72,8 @@
android:name=".EmergencyDialerTrampoline"
android:theme="@android:style/Theme.NoDisplay"
android:excludeFromRecents="true"
- android:exported="true">
+ android:enabled="false"
+ android:exported="false">
<intent-filter>
<action android:name="android.intent.action.DIAL_EMERGENCY"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -73,58 +86,55 @@
</activity>
<!-- Alias for edit activity, to allow settings suggestion to be independent from main activity -->
- <activity-alias
- android:name=".edit.EditInfoSuggestion"
- android:label="@string/app_label"
- android:targetActivity=".edit.EditInfoActivity"
- android:exported="true">
+ <activity-alias android:name=".edit.EditInfoSuggestion"
+ android:label="@string/app_label"
+ android:targetActivity=".edit.EditInfoActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION"/>
</intent-filter>
- <meta-data android:name="com.android.settings.dismiss" android:value="11,15,30" />
+ <meta-data android:name="com.android.settings.dismiss"
+ android:value="11,15,30"/>
<meta-data android:name="com.android.settings.title"
- android:resource="@string/settings_suggestion_title" />
+ android:resource="@string/settings_suggestion_title"/>
<meta-data android:name="com.android.settings.summary"
- android:resource="@string/settings_suggestion_body" />
+ android:resource="@string/settings_suggestion_body"/>
<meta-data android:name="com.android.settings.icon"
- android:resource="@drawable/ic_local_hospital_24dp" />
+ android:resource="@drawable/ic_local_hospital_24dp"/>
</activity-alias>
- <activity
- android:name=".edit.EditMedicalInfoActivity"
- android:icon="@drawable/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">
+ <activity android:name=".edit.EditMedicalInfoActivity"
+ android:icon="@drawable/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"
+ android:exported="true">
<intent-filter>
- <action android:name="android.emergency.EDIT_MEDICAL_INFO" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.emergency.EDIT_MEDICAL_INFO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <provider
- android:name=".EmergencySearchIndexablesProvider"
- android:authorities="com.android.emergency"
- android:multiprocess="false"
- android:grantUriPermissions="true"
- android:permission="android.permission.READ_SEARCH_INDEXABLES"
- android:exported="true">
+ <provider android:name=".EmergencySearchIndexablesProvider"
+ android:authorities="com.android.emergency"
+ android:multiprocess="false"
+ android:grantUriPermissions="true"
+ android:permission="android.permission.READ_SEARCH_INDEXABLES"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.action.SEARCH_INDEXABLES_PROVIDER" />
+ <action android:name="android.content.action.SEARCH_INDEXABLES_PROVIDER"/>
</intent-filter>
</provider>
- <provider
- android:name="androidx.core.content.FileProvider"
- android:authorities="com.android.emergency.files"
- android:grantUriPermissions="true"
- android:exported="false">
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/file_paths" />
+ <provider android:name="androidx.core.content.FileProvider"
+ android:authorities="com.android.emergency.files"
+ android:grantUriPermissions="true"
+ android:exported="false">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths"/>
</provider>
</application>
diff --git a/OWNERS b/OWNERS
index 764f79c..1da401c 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,7 +1,9 @@
# Default code reviewers picked from top 3 or more developers.
# Please update this list if you find better candidates.
-asapperstein@google.com
-mariagpuyol@google.com
+peet@google.com
+lindatseng@google.com
mfritze@google.com
-yuanjiahsu@google.com
zhfan@google.com
+
+#GestureLauncherService
+joselima@google.com
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5200075..352a435 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,16 +23,16 @@
<string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
<string name="name" msgid="4286267457738861977">"Nombre"</string>
- <string name="unknown_name" msgid="2834802479170495056">"Sin definir"</string>
+ <string name="unknown_name" msgid="2834802479170495056">"Se desconoce"</string>
<string name="address" msgid="6449303483151189969">"Dirección"</string>
- <string name="unknown_address" msgid="4212576729941786121">"Sin definir"</string>
+ <string name="unknown_address" msgid="4212576729941786121">"Se desconoce"</string>
<string name="date_of_birth" msgid="777979232444227891">"Fecha de nacimiento"</string>
- <string name="unknown_date_of_birth" msgid="7416355536916066758">"Sin definir"</string>
+ <string name="unknown_date_of_birth" msgid="7416355536916066758">"Se desconoce"</string>
<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 fecha de nacimiento"</string>
<string name="blood_type" msgid="6947022772999974608">"Grupo sanguíneo"</string>
- <string name="unknown_blood_type" msgid="6337228278125085668">"Sin definir"</string>
+ <string name="unknown_blood_type" msgid="6337228278125085668">"Se desconoce"</string>
<string name="oplus" msgid="7759756742377867011">"O+"</string>
<string name="ominus" msgid="5227278501191741055">"O-"</string>
<string name="aplus" msgid="4982472245421753463">"A+"</string>
@@ -72,16 +72,16 @@
<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">"Sin definir"</string>
+ <string name="unknown_allergies" msgid="4383115953418061237">"Se desconoce"</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">"Sin definir"</string>
+ <string name="unknown_medications" msgid="2764171064510423734">"Se desconoce"</string>
<string name="medications_hint" msgid="3221620025945593723">"Por ejemplo, aspirina"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Notas médicas"</string>
- <string name="unknown_medical_conditions" msgid="8051364895172053770">"Sin definir"</string>
+ <string name="unknown_medical_conditions" msgid="8051364895172053770">"Se desconoce"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Por ejemplo, asma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Donante de órganos"</string>
- <string name="unknown_organ_donor" msgid="2780515342875494225">"Sin definir"</string>
+ <string name="unknown_organ_donor" msgid="2780515342875494225">"Se desconoce"</string>
<string name="yes" msgid="5829765567799916128">"Sí"</string>
<string name="no" msgid="1681689233660683509">"No"</string>
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7a26649..a675095 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -95,7 +95,7 @@
<string name="remove_contact_icon_text" msgid="4576641386490101363">"Poista yhteystieto"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"Yhteystietojen lukeminen ei onnistu."</string>
<string name="remove" msgid="1243949503772376064">"Poista"</string>
- <string name="cancel" msgid="7401575239009060939">"Peruuta"</string>
+ <string name="cancel" msgid="7401575239009060939">"Peru"</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="no_info_provided" msgid="716200382010821001">"Ei tietoja puhelimen omistajasta"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d23ec63..77c0c5d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -30,7 +30,7 @@
<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="remove_dob_icon_text" msgid="4413507180967999944">"Quita a data de nacemento"</string>
<string name="blood_type" msgid="6947022772999974608">"Grupo sanguíneo"</string>
<string name="unknown_blood_type" msgid="6337228278125085668">"Sen indicar"</string>
<string name="oplus" msgid="7759756742377867011">"O+"</string>
@@ -91,10 +91,10 @@
<string name="add_emergency_contact" msgid="4063577069613981029">"Engadir contacto"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"Non se puido encontrar un selector de contactos"</string>
<string name="fail_display_contact" msgid="4128854688897045879">"Non se pode mostrar o contacto"</string>
- <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de emerxencia?"</string>
- <string name="remove_contact_icon_text" msgid="4576641386490101363">"Eliminar contacto"</string>
+ <string name="remove_contact" msgid="6934983445723096759">"Queres quitar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de emerxencia?"</string>
+ <string name="remove_contact_icon_text" msgid="4576641386490101363">"Quitar contacto"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"Non se puido ler correctamente a información de contacto"</string>
- <string name="remove" msgid="1243949503772376064">"Eliminar"</string>
+ <string name="remove" msgid="1243949503772376064">"Quitar"</string>
<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>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6d8c17f..3e207c7 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -94,7 +94,7 @@
<string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> ને કટોકટીના સંપર્કોમાંથી દૂર કરીએ?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"સંપર્ક દૂર કરો"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"સંપર્ક માહિતી યોગ્ય રીતે વાંચવામાં અસમર્થ"</string>
- <string name="remove" msgid="1243949503772376064">"દૂર કરો"</string>
+ <string name="remove" msgid="1243949503772376064">"કાઢી નાખો"</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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 08a36fb..c62d815 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -30,7 +30,7 @@
<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>
- <string name="remove_dob_icon_text" msgid="4413507180967999944">"הסר את תאריך הלידה"</string>
+ <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>
@@ -92,14 +92,14 @@
<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>
- <string name="remove_contact_icon_text" msgid="4576641386490101363">"הסר את איש הקשר"</string>
+ <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="remove" msgid="1243949503772376064">"הסרה"</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="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-km/strings.xml b/res/values-km/strings.xml
index 2e364a1..ad4de03 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -94,7 +94,7 @@
<string name="remove_contact" msgid="6934983445723096759">"យក <xliff:g id="CONTACT_NAME">%1$s</xliff:g> ចេញពីទំនាក់ទំនងសង្គ្រោះបន្ទាន់ឬ?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"យកទំនាក់ទំនងចេញ"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"មិនអាចអានព័ត៌មានទំនាក់ទំនងបានត្រឹមត្រូវទេ"</string>
- <string name="remove" msgid="1243949503772376064">"យកចេញ"</string>
+ <string name="remove" msgid="1243949503772376064">"ដកចេញ"</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>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 1729069..d58cbbd 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -94,7 +94,7 @@
<string name="remove_contact" msgid="6934983445723096759">"Өзгөчө кырдаал байланыштарынан <xliff:g id="CONTACT_NAME">%1$s</xliff:g> өчүрөсүзбү?"</string>
<string name="remove_contact_icon_text" msgid="4576641386490101363">"Байланышты алып салуу"</string>
<string name="fail_add_contact" msgid="6511490846952942291">"Байланыш маалыматы туура окулбай жатат"</string>
- <string name="remove" msgid="1243949503772376064">"Алып салуу"</string>
+ <string name="remove" msgid="1243949503772376064">"Өчүрүү"</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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3f001a3..920c83d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -99,7 +99,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="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="tap_pencil" msgid="2723698054265296934">"Als dit je telefoon is, tik je op het potloodje om informatie toe te voegen die in geval van nood hier zichtbaar is"</string>
<string name="clear_all" msgid="8899013032870561633">"Alles wissen"</string>
<string name="clear" msgid="3648880442502887163">"Wissen"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Alle informatie en contacten wissen?"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f0d71c2..4ffce08 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -95,7 +95,7 @@
<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="no_info_provided" msgid="716200382010821001">"ଫୋନ୍ ମାଲିକଙ୍କର କିଛି ସୂଚନା ନାହିଁ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dd28c72..b430c0b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -109,5 +109,5 @@
<string name="user_image_take_photo" msgid="2779924488370750102">"Tirar uma foto"</string>
<string name="user_image_choose_photo" msgid="2442095378052415700">"Escolher uma imagem"</string>
<string name="user_image_photo_selector" msgid="8941966433899876760">"Selecionar foto"</string>
- <string name="user_nickname" msgid="7956055372443961161">"Pseudónimo"</string>
+ <string name="user_nickname" msgid="7956055372443961161">"Alcunha"</string>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d878aa5..3146879 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -88,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 saqlash"</string>
+ <string name="add_emergency_contact" msgid="4063577069613981029">"Kontaktni 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>
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index 26d33bf..dd3e0ee 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_library {
name: "emergencyinfo-test-common",
// Include all test java files.
diff --git a/tests/robolectric/Android.bp b/tests/robolectric/Android.bp
index 6af1bc8..17d944e 100644
--- a/tests/robolectric/Android.bp
+++ b/tests/robolectric/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_robolectric_test {
name: "EmergencyInfoRoboTests",
srcs: ["src/**/*.java"],
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index d43b6ac..248c46a 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "EmergencyInfoUnitTests",
libs: ["android.test.runner"],
