Snap for 15057570 from 7fffc521b063a9b84c98b33ffda267e60113fe4f to car-apps-aosp-release

Change-Id: I88a3e7a4523508c0238284e6e2b6d336f1d055ed
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ea23343..6b84fd4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,7 +21,7 @@
     <string name="nothing_to_play" msgid="5916260606572129130">"No hi ha contingut multimèdia disponible en aquesta llista"</string>
     <string name="cannot_connect_to_app" msgid="4732888036680095414">"<xliff:g id="ID_1">%s</xliff:g> no funciona en aquests moments."</string>
     <string name="unknown_media_provider_name" msgid="4238216994694326667">"Desconegut"</string>
-    <string name="unknown_error" msgid="6146463797752964372">"S\'ha produït un error"</string>
+    <string name="unknown_error" msgid="6146463797752964372">"Hi ha hagut un error"</string>
     <string name="media_browse_more" msgid="6330295386693311592">"Més…"</string>
     <string name="media_app_title" msgid="94717597743776797">"Multimèdia"</string>
     <string name="search_hint" msgid="5401750426238148416">"Cerca cançons, artistes i més…"</string>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index 77e033c..7a4e14c 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -185,6 +185,63 @@
       <item type="id" name="ui_content_start_guideline"/>
       <item type="id" name="ui_content_top_guideline"/>
       <item type="id" name="ui_content_top_guideline2"/>
+      <item type="attr" name="oemColorPrimary" />
+      <item type="attr" name="oemColorOnPrimary" />
+      <item type="attr" name="oemColorPrimaryContainer" />
+      <item type="attr" name="oemColorOnPrimaryContainer" />
+      <item type="attr" name="oemColorPrimaryInverse" />
+      <item type="attr" name="oemColorSecondary" />
+      <item type="attr" name="oemColorOnSecondary" />
+      <item type="attr" name="oemColorSecondaryContainer" />
+      <item type="attr" name="oemColorOnSecondaryContainer" />
+      <item type="attr" name="oemColorTertiary" />
+      <item type="attr" name="oemColorOnTertiary" />
+      <item type="attr" name="oemColorTertiaryContainer" />
+      <item type="attr" name="oemColorOnTertiaryContainer" />
+      <item type="attr" name="oemColorError" />
+      <item type="attr" name="oemColorOnError" />
+      <item type="attr" name="oemColorErrorContainer" />
+      <item type="attr" name="oemColorOnErrorContainer" />
+      <item type="attr" name="oemColorSurface" />
+      <item type="attr" name="oemColorOnSurface" />
+      <item type="attr" name="oemColorSurfaceVariant" />
+      <item type="attr" name="oemColorOnSurfaceVariant" />
+      <item type="attr" name="oemColorSurfaceInverse" />
+      <item type="attr" name="oemColorOnSurfaceInverse" />
+      <item type="attr" name="oemColorOutline" />
+      <item type="attr" name="oemColorScrim" />
+      <item type="attr" name="oemColorOutlineVariant" />
+      <item type="attr" name="oemColorSurfaceTint" />
+      <item type="attr" name="oemColorSurfaceDim" />
+      <item type="attr" name="oemColorSurfaceBright" />
+      <item type="attr" name="oemColorSurfaceContainer" />
+      <item type="attr" name="oemColorSurfaceContainerLow" />
+      <item type="attr" name="oemColorSurfaceContainerLowest" />
+      <item type="attr" name="oemColorSurfaceContainerHigh" />
+      <item type="attr" name="oemColorSurfaceContainerHighest" />
+      <item type="attr" name="oemColorShadow" />
+      <item type="attr" name="oemTextAppearanceDisplayLarge" />
+      <item type="attr" name="oemTextAppearanceDisplayMedium" />
+      <item type="attr" name="oemTextAppearanceDisplaySmall" />
+      <item type="attr" name="oemTextAppearanceHeadlineLarge" />
+      <item type="attr" name="oemTextAppearanceHeadlineMedium" />
+      <item type="attr" name="oemTextAppearanceHeadlineSmall" />
+      <item type="attr" name="oemTextAppearanceTitleLarge" />
+      <item type="attr" name="oemTextAppearanceTitleMedium" />
+      <item type="attr" name="oemTextAppearanceTitleSmall" />
+      <item type="attr" name="oemTextAppearanceLabelLarge" />
+      <item type="attr" name="oemTextAppearanceLabelMedium" />
+      <item type="attr" name="oemTextAppearanceLabelSmall" />
+      <item type="attr" name="oemTextAppearanceBodyLarge" />
+      <item type="attr" name="oemTextAppearanceBodyMedium" />
+      <item type="attr" name="oemTextAppearanceBodySmall" />
+      <item type="attr" name="oemShapeCornerNone" />
+      <item type="attr" name="oemShapeCornerExtraSmall" />
+      <item type="attr" name="oemShapeCornerSmall" />
+      <item type="attr" name="oemShapeCornerMedium" />
+      <item type="attr" name="oemShapeCornerLarge" />
+      <item type="attr" name="oemShapeCornerExtraLarge" />
+      <item type="attr" name="oemShapeCornerFull" />
       <item type="integer" name="blocking_activity_relaunch_time_ms"/>
       <item type="integer" name="fragment_playback_queue_fade_duration_ms"/>
       <item type="integer" name="max_tabs"/>