MediaRouter: Apply the new text style
Bug: 23117157
Change-Id: I22e3a13559c191c850cae20f6adee560b31f99c4
diff --git a/v7/mediarouter/res/layout-v17/mr_media_route_list_item.xml b/v7/mediarouter/res/layout-v17/mr_media_route_list_item.xml
index e1ae9e6..e0bb840 100644
--- a/v7/mediarouter/res/layout-v17/mr_media_route_list_item.xml
+++ b/v7/mediarouter/res/layout-v17/mr_media_route_list_item.xml
@@ -40,7 +40,7 @@
android:singleLine="true"
android:gravity="bottom"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="?attr/mediaRouteTextStyle"
android:duplicateParentState="true" />
<TextView android:id="@android:id/text2"
@@ -48,7 +48,7 @@
android:layout_height="24dp"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?attr/mediaRouteSecondaryTextStyle"
android:duplicateParentState="true" />
</LinearLayout>
diff --git a/v7/mediarouter/res/values/attrs.xml b/v7/mediarouter/res/values/attrs.xml
index 482525e..36dd38f 100644
--- a/v7/mediarouter/res/values/attrs.xml
+++ b/v7/mediarouter/res/values/attrs.xml
@@ -37,4 +37,6 @@
<attr name="mediaRouteDefaultIconDrawable" format="reference" />
<attr name="mediaRouteSpeakerIconDrawable" format="reference" />
<attr name="mediaRouteSpeakerGroupIconDrawable" format="reference" />
+ <attr name="mediaRouteTextStyle" format="reference" />
+ <attr name="mediaRouteSecondaryTextStyle" format="reference" />
</resources>
diff --git a/v7/mediarouter/res/values/styles.xml b/v7/mediarouter/res/values/styles.xml
index 39bd56d..1023f80 100644
--- a/v7/mediarouter/res/values/styles.xml
+++ b/v7/mediarouter/res/values/styles.xml
@@ -26,4 +26,32 @@
<item name="android:contentDescription">@string/mr_media_route_button_content_description</item>
<item name="externalRouteEnabledDrawable">@drawable/mr_ic_media_route_mono_light</item>
</style>
+
+ <style name="Widget.MediaRouter.MediaRouteText" parent="">
+ <item name="android:fontFamily">sans-serif</item>
+ </style>
+
+ <style name="Widget.MediaRouter.MediaRouteText.Primary">
+ <item name="android:textSize">18sp</item>
+ </style>
+
+ <style name="Widget.MediaRouter.MediaRouteText.Secondary">
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <style name="Widget.MediaRouter.MediaRouteText.Primary.Dark">
+ <item name="android:textColor">#FFFFFFFF</item>
+ </style>
+
+ <style name="Widget.MediaRouter.MediaRouteText.Primary.Light">
+ <item name="android:textColor">#DE000000</item>
+ </style>
+
+ <style name="Widget.MediaRouter.MediaRouteText.Secondary.Dark">
+ <item name="android:textColor">#8AFFFFFF</item>
+ </style>
+
+ <style name="Widget.MediaRouter.MediaRouteText.Secondary.Light">
+ <item name="android:textColor">#8A000000</item>
+ </style>
</resources>
diff --git a/v7/mediarouter/res/values/themes.xml b/v7/mediarouter/res/values/themes.xml
index c004ab3..70a58ad 100644
--- a/v7/mediarouter/res/values/themes.xml
+++ b/v7/mediarouter/res/values/themes.xml
@@ -30,6 +30,8 @@
<item name="mediaRouteDefaultIconDrawable">@drawable/ic_tv_dark</item>
<item name="mediaRouteSpeakerIconDrawable">@drawable/ic_speaker_dark</item>
<item name="mediaRouteSpeakerGroupIconDrawable">@drawable/ic_speaker_group_dark</item>
+ <item name="mediaRouteTextStyle">@style/Widget.MediaRouter.MediaRouteText.Primary.Dark</item>
+ <item name="mediaRouteSecondaryTextStyle">@style/Widget.MediaRouter.MediaRouteText.Secondary.Dark</item>
</style>
<style name="Theme.MediaRouter.Light" parent="">
@@ -46,6 +48,8 @@
<item name="mediaRouteDefaultIconDrawable">@drawable/ic_tv_light</item>
<item name="mediaRouteSpeakerIconDrawable">@drawable/ic_speaker_light</item>
<item name="mediaRouteSpeakerGroupIconDrawable">@drawable/ic_speaker_group_light</item>
+ <item name="mediaRouteTextStyle">@style/Widget.MediaRouter.MediaRouteText.Primary.Light</item>
+ <item name="mediaRouteSecondaryTextStyle">@style/Widget.MediaRouter.MediaRouteText.Secondary.Light</item>
</style>
</resources>
