Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
diff --git a/res/layout/item_doc_inflated_message_cross_profile.xml b/res/layout/item_doc_inflated_message_cross_profile.xml
index 520d398..3cc0d7c 100644
--- a/res/layout/item_doc_inflated_message_cross_profile.xml
+++ b/res/layout/item_doc_inflated_message_cross_profile.xml
@@ -55,7 +55,7 @@
android:textAppearance="@style/EmptyStateTitleText"/>
<TextView
android:id="@+id/message"
- android:layout_marginTop="4dp"
+ android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
index b375078..64bbaa2 100644
--- a/res/values-night-v31/colors.xml
+++ b/res/values-night-v31/colors.xml
@@ -19,6 +19,6 @@
@*android:color/system_neutral1_800
</color> <!-- neutral 800 -->
<color name="work_profile_button_stroke_color">
- @*android:color/system_neutral1_400
- </color> <!-- neutral 400 -->
+ @*android:color/system_accent1_200
+ </color> <!-- accent 200 -->
</resources>
diff --git a/res/values-night-v31/styles.xml b/res/values-night-v31/styles.xml
index f58593c..0cbb57b 100644
--- a/res/values-night-v31/styles.xml
+++ b/res/values-night-v31/styles.xml
@@ -27,4 +27,11 @@
<item name="fontFamily">@string/config_fontFamilyMedium</item>
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
+
+ <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+ <item name="android:backgroundTint">@android:color/transparent</item>
+ <item name="android:textColor">@*android:color/system_neutral1_100</item>
+ <item name="android:textAllCaps">false</item>
+ <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
+ </style>
</resources>
diff --git a/res/values-ta/inspector_strings.xml b/res/values-ta/inspector_strings.xml
index a82b01b..8657657 100644
--- a/res/values-ta/inspector_strings.xml
+++ b/res/values-ta/inspector_strings.xml
@@ -21,7 +21,7 @@
<string name="inspector_debug_section" msgid="2576052661505700421">"பிழைத்திருத்தத் தகவல் (டெவெலப்பர்கள் மட்டும்)"</string>
<string name="inspector_debug_metadata_section" msgid="5875140675600744846">"அசல் மீத்தரவு: <xliff:g id="METADATATYPE">%1$s</xliff:g>"</string>
<string name="inspector_metadata_section" msgid="6077622515328240575">"மீடியா விவரங்கள்"</string>
- <string name="handler_app_file_opens_with" msgid="5272329600389613550">"இந்தக் கோப்பு வகையை, பின்வரும் பயன்பாடு திறக்கும்:"</string>
+ <string name="handler_app_file_opens_with" msgid="5272329600389613550">"இந்த ஃபைல் வகையை, பின்வரும் பயன்பாடு திறக்கும்:"</string>
<string name="handler_app_belongs_to" msgid="5444507329303253553">"இந்த ஃபைலை வழங்குவது:"</string>
<string name="handler_app_not_selected" msgid="1294439257183908786">"தேர்ந்தெடுக்கவில்லை"</string>
<string name="handler_app_unknown" msgid="5911661530593229287">"தெரியாதது"</string>
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 4029685..1598ace 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
@@ -15,6 +14,8 @@
-->
<resources>
- <color name="tab_selected_text_color">@android:color/white</color>
- <color name="work_profile_button_stroke_color">#747775</color> <!-- neutral 500 -->
+ <color name="tab_selected_text_color">@android:color/white</color>
+ <color name="work_profile_button_stroke_color">
+ @*android:color/system_accent1_600
+ </color> <!-- primary 600 -->
</resources>
diff --git a/res/values-v31/dimens.xml b/res/values-v31/dimens.xml
index 517a12d..87b5f1a 100644
--- a/res/values-v31/dimens.xml
+++ b/res/values-v31/dimens.xml
@@ -21,4 +21,5 @@
<dimen name="profile_tab_padding">20dp</dimen>
<dimen name="cross_profile_button_corner_radius">30dp</dimen>
<dimen name="cross_profile_button_stroke_width">1dp</dimen>
+ <dimen name="cross_profile_button_message_margin_top">16dp</dimen>
</resources>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
index 83bd86f..eaaa2b9 100644
--- a/res/values-v31/styles.xml
+++ b/res/values-v31/styles.xml
@@ -41,7 +41,7 @@
<style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:backgroundTint">@android:color/transparent</item>
- <item name="android:textColor">?android:attr/colorAccent</item>
+ <item name="android:textColor">@*android:color/system_neutral1_900</item>
<item name="android:textAllCaps">false</item>
<item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
</style>
diff --git a/res/values-v31/styles_text.xml b/res/values-v31/styles_text.xml
index 4307c51..527e2de 100644
--- a/res/values-v31/styles_text.xml
+++ b/res/values-v31/styles_text.xml
@@ -17,6 +17,12 @@
<style name="EmptyStateTitleText">
<item name="android:textColor">@color/empty_state_text</item>
<item name="android:textSize">18sp</item>
- <item name="fontFamily">@string/config_fontFamilyMedium</item>
+ <item name="fontFamily">@string/config_headerFontFamily</item>
+ </style>
+
+ <style name="EmptyStateMessageText">
+ <item name="android:textColor">?android:textColorSecondary</item>
+ <item name="android:textSize">14sp</item>
+ <item name="fontFamily">@string/config_fontFamily</item>
</style>
</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4019304..0373753 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -131,4 +131,5 @@
<dimen name="item_doc_inflated_message_padding_top">0dp</dimen>
<dimen name="cross_profile_button_corner_radius">0dp</dimen>
<dimen name="cross_profile_button_stroke_width">0dp</dimen>
+ <dimen name="cross_profile_button_message_margin_top">4dp</dimen>
</resources>