aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-26 22:41:21 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-26 22:41:21 +0000
commitd7ee87a5bdb2c5563640f41db0c53ce5436df6e2 (patch)
tree256b0d0c1bc48dbbf1b684cfc36efe337a91ea47
parent6451156da2ec88b47525675ef1da6bcc4798bb45 (diff)
parentd3512ca9b8f87ff6d352975de40240f0180f37e5 (diff)
downloadCar-android13-mainline-mediaprovider-release.tar.gz
Snap for 9656615 from d3512ca9b8f87ff6d352975de40240f0180f37e5 to mainline-mediaprovider-releaseaml_mpr_331812020aml_mpr_331711020android13-mainline-mediaprovider-release
Change-Id: I3462895704f8c7b729a8988d5e1578d1defbfdbb
-rw-r--r--car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml2
-rw-r--r--experimental/service/res/values-it/strings.xml4
-rw-r--r--tests/CarLibTests/Android.bp4
3 files changed, 4 insertions, 6 deletions
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
index c7045441da..b0dce96f83 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="owner_name" msgid="3416113395996003764">"Autista"</string>
+ <string name="owner_name" msgid="3416113395996003764">"Conducente"</string>
<string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"Accesso alla posizione approssimativa solo in primo piano"</string>
</resources>
diff --git a/experimental/service/res/values-it/strings.xml b/experimental/service/res/values-it/strings.xml
index a48bb0f921..389a78686a 100644
--- a/experimental/service/res/values-it/strings.xml
+++ b/experimental/service/res/values-it/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione dell\'autista"</string>
- <string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Leggi il livello di distrazione dell\'autista"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione del conducente"</string>
+ <string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lettura del livello di distrazione del conducente."</string>
</resources>
diff --git a/tests/CarLibTests/Android.bp b/tests/CarLibTests/Android.bp
index 1484374a35..f0914fa204 100644
--- a/tests/CarLibTests/Android.bp
+++ b/tests/CarLibTests/Android.bp
@@ -35,9 +35,6 @@ android_robolectric_test {
libs: [
"android.car",
- "Robolectric_all-target",
- "robolectric_android-all-stub",
- "mockito-robolectric-prebuilt",
"truth-prebuilt",
"androidx.test.core",
"android.car.testapi",
@@ -45,5 +42,6 @@ android_robolectric_test {
],
instrumentation_for: "CarLibTestApp",
+ upstream: true,
}