Merge changes from topic "tv-systemui-google-sans" into main
* changes:
Audio output: improve font styling
Add font type scales to be overlaid with RRO
diff --git a/res/layout/media_output_dialog.xml b/res/layout/media_output_dialog.xml
index bcf1fe9..535c862 100644
--- a/res/layout/media_output_dialog.xml
+++ b/res/layout/media_output_dialog.xml
@@ -31,7 +31,7 @@
android:layout_margin="@dimen/media_dialog_title_margin"
android:text="@string/media_output_dialog_title"
android:textColor="@color/media_dialog_title"
- android:textFontWeight="500"
+ android:fontFamily="@string/font_label_large"
android:textSize="@dimen/media_dialog_title" />
<com.android.internal.widget.RecyclerView
diff --git a/res/layout/media_output_list_group_divider.xml b/res/layout/media_output_list_group_divider.xml
index 25dfd22..ba88ecc 100644
--- a/res/layout/media_output_list_group_divider.xml
+++ b/res/layout/media_output_list_group_divider.xml
@@ -38,6 +38,8 @@
android:layout_marginTop="@dimen/media_output_text_divider_margin_top"
android:layout_gravity="center_horizontal"
android:textAllCaps="true"
+ android:letterSpacing="0.08"
+ android:fontFamily="@string/font_overline"
android:textSize="@dimen/media_dialog_divider_text"
android:textColor="@color/media_dialog_divider_text" />
</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/media_output_list_item_advanced.xml b/res/layout/media_output_list_item_advanced.xml
index f592b51..4253104 100644
--- a/res/layout/media_output_list_item_advanced.xml
+++ b/res/layout/media_output_list_item_advanced.xml
@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:textColor="@color/media_dialog_item_title"
android:textSize="@dimen/media_dialog_item_title"
- android:textFontWeight="500"
+ android:fontFamily="@string/font_label_medium"
android:ellipsize="marquee"
android:singleLine="true"
android:marqueeRepeatLimit="marquee_forever"
@@ -69,6 +69,7 @@
android:layout_height="wrap_content"
android:textColor="@color/media_dialog_item_subtitle"
android:textSize="@dimen/media_dialog_item_subtitle"
+ android:fontFamily="@string/font_body_extra_small"
android:ellipsize="marquee"
android:singleLine="true"
android:marqueeRepeatLimit="marquee_forever"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c2551dd..5de17d4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -37,4 +37,28 @@
<string name="media_output_dialog_title">Audio output</string>
<string name="media_output_dialog_other_devices">Other devices</string>
<string name="media_output_dialog_pairing_new">Connect another device</string>
+
+ <string name="font_display_large" translatable="false">sans-serif</string>
+ <string name="font_display_medium" translatable="false">sans-serif</string>
+ <string name="font_display_small" translatable="false">sans-serif</string>
+
+ <string name="font_headline_large" translatable="false">sans-serif</string>
+ <string name="font_headline_medium" translatable="false">sans-serif</string>
+ <string name="font_headline_small" translatable="false">sans-serif</string>
+
+ <string name="font_title_large" translatable="false">sans-serif</string>
+ <string name="font_title_medium" translatable="false">roboto-medium</string>
+ <string name="font_title_small" translatable="false">roboto-medium</string>
+
+ <string name="font_label_extra_large" translatable="false">roboto-medium</string>
+ <string name="font_label_large" translatable="false">roboto-medium</string>
+ <string name="font_label_medium" translatable="false">roboto-medium</string>
+ <string name="font_label_small" translatable="false">roboto-medium</string>
+
+ <string name="font_body_large" translatable="false">roboto</string>
+ <string name="font_body_medium" translatable="false">roboto</string>
+ <string name="font_body_small" translatable="false">roboto</string>
+ <string name="font_body_extra_small" translatable="false">roboto</string>
+
+ <string name="font_overline" translatable="false">sans-serif</string>
</resources>