diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-08 17:30:32 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-08 17:30:32 +0000 |
commit | e8ef3a346f65f475986d740c19af36bae3b5f820 (patch) | |
tree | 9a8746ee690029bf058110ae3dabb5e69a8caeaf | |
parent | 03d1123fa1dcd6f591721e9ff6d7fe969728c525 (diff) | |
parent | 6103567562e6964358030ba9f263933eb74afcbe (diff) | |
download | EmergencyInfo-e8ef3a346f65f475986d740c19af36bae3b5f820.tar.gz |
Snap for 10276566 from 6103567562e6964358030ba9f263933eb74afcbe to tm-platform-releaseandroid-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android13-platform-release
Change-Id: Iddee02b4b0f95fc8bc1ff1dfe232e65a5159253e
-rw-r--r-- | res/values-ca/strings.xml | 2 | ||||
-rw-r--r-- | res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | res/values-gl/strings.xml | 4 | ||||
-rw-r--r-- | tests/robolectric/Android.bp | 1 | ||||
-rw-r--r-- | tests/robolectric/config/robolectric.properties | 1 | ||||
-rw-r--r-- | tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java | 6 | ||||
-rw-r--r-- | tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index a3db3671..f4e222c0 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -103,7 +103,7 @@ <string name="clear_all" msgid="8899013032870561633">"Esborra-ho tot"</string> <string name="clear" msgid="3648880442502887163">"Esborra"</string> <string name="clear_all_message" msgid="1548432000373861295">"Vols esborrar tota la informació i tots els contactes?"</string> - <string name="emergency_info_footer" msgid="8751758742506410146">"Afegir informació mèdica i contactes d\'emergència pot ser útil per als primers interventors.\n\nTothom pot veure aquesta informació des de la pantalla de bloqueig i tocar els noms dels teus contactes per trucar-los sense desbloquejar el telèfon."</string> + <string name="emergency_info_footer" msgid="8751758742506410146">"Afegir informació mèdica i contactes d\'emergència pot ser útil per al personal d\'emergències.\n\nTothom pot veure aquesta informació des de la pantalla de bloqueig i tocar els noms dels teus contactes per trucar-los sense desbloquejar el telèfon."</string> <string name="settings_suggestion_title" msgid="2503369576806243476">"Afegeix la informació d\'emergència"</string> <string name="settings_suggestion_body" msgid="5559349261345837716">"Mostra la teva informació a primers auxilis"</string> <string name="user_image_take_photo" msgid="2779924488370750102">"Fes una foto"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 4c13643f..dfcbde4c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -17,7 +17,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">"Notfallinformationen"</string> - <string name="medical_info_title" msgid="3000192781136934887">"Medizinische Informationen"</string> + <string name="medical_info_title" msgid="3000192781136934887">"Medizinische Daten"</string> <string name="add_medical_info" msgid="483921612415907139">"Informationen hinzufügen"</string> <string name="edit_info" msgid="5973929805855224805">"Notfallinformationen bearbeiten"</string> <string name="tab_title_info" msgid="1402033103294855812">"Info"</string> diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index f9c10a17..40b31226 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -19,7 +19,7 @@ <string name="app_label" msgid="1090682794607161063">"Información de emerxencia"</string> <string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string> <string name="add_medical_info" msgid="483921612415907139">"Engadir información"</string> - <string name="edit_info" msgid="5973929805855224805">"Editar información de emerxencia"</string> + <string name="edit_info" msgid="5973929805855224805">"Editar información para emerxencias"</string> <string name="tab_title_info" msgid="1402033103294855812">"Información"</string> <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string> <string name="name" msgid="4286267457738861977">"Nome"</string> @@ -104,7 +104,7 @@ <string name="clear" msgid="3648880442502887163">"Borrar"</string> <string name="clear_all_message" msgid="1548432000373861295">"Queres borrar toda a información e os contactos?"</string> <string name="emergency_info_footer" msgid="8751758742506410146">"Engadir contactos de emerxencia e información médica pode resultar útil para os servizos de emerxencias en caso dunha emerxencia.\n\nCalquera persoa pode ler esta información na túa pantalla de bloqueo e tocar os nomes dos contactos para marcar os seus números sen necesidade de desbloquear o teléfono."</string> - <string name="settings_suggestion_title" msgid="2503369576806243476">"Engadir información de emerxencia"</string> + <string name="settings_suggestion_title" msgid="2503369576806243476">"Engadir información para emerxencias"</string> <string name="settings_suggestion_body" msgid="5559349261345837716">"Permite que os servizos de emerxencias vexan os teus datos"</string> <string name="user_image_take_photo" msgid="2779924488370750102">"Tirar unha foto"</string> <string name="user_image_choose_photo" msgid="2442095378052415700">"Escoller unha imaxe"</string> diff --git a/tests/robolectric/Android.bp b/tests/robolectric/Android.bp index 17d944eb..50350367 100644 --- a/tests/robolectric/Android.bp +++ b/tests/robolectric/Android.bp @@ -22,4 +22,5 @@ android_robolectric_test { java_resource_dirs: ["config"], static_libs: ["emergencyinfo-test-common"], instrumentation_for: "EmergencyInfo", + upstream: true, } diff --git a/tests/robolectric/config/robolectric.properties b/tests/robolectric/config/robolectric.properties index fab7251d..2a9e50df 100644 --- a/tests/robolectric/config/robolectric.properties +++ b/tests/robolectric/config/robolectric.properties @@ -1 +1,2 @@ sdk=NEWEST_SDK +instrumentedPackages=androidx.preference diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java index b03edbe5..987c13c1 100644 --- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java +++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java @@ -16,11 +16,11 @@ package com.android.emergency.preferences; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java index 0fde2261..a80d57cd 100644 --- a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java +++ b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java @@ -16,10 +16,10 @@ package com.android.emergency.util; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; |