MediaRouter: Update the font style of route dialogs
Bug: 23117610
Change-Id: I990d0e167678d27cefe54f13d141942c65b1ecef
diff --git a/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml b/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
index 66544ec..ef2b441 100644
--- a/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
+++ b/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
@@ -33,8 +33,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorPrimary" />
+ android:textAppearance="?attr/mediaRouteControllerTitleTextStyle" />
<ImageButton android:id="@+id/settings"
android:layout_width="48dip"
android:layout_height="48dip"
@@ -53,7 +52,7 @@
<RelativeLayout android:id="@+id/default_control_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/colorPrimary" >
+ android:background="?attr/colorPrimary">
<ImageView android:id="@+id/art"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -81,17 +80,12 @@
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="16sp"
- android:textStyle="bold"
+ android:textAppearance="?attr/mediaRouteControllerPrimaryTextStyle"
android:singleLine="true" />
<TextView android:id="@+id/subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="14sp"
+ android:textAppearance="?attr/mediaRouteControllerSecondaryTextStyle"
android:singleLine="true" />
</LinearLayout>
</RelativeLayout>
@@ -102,7 +96,8 @@
android:layout_height="64dp"
android:gravity="center_vertical"
android:padding="8dp"
- android:visibility="gone">
+ android:visibility="gone"
+ android:background="?attr/colorPrimary">
<ImageView android:layout_width="48dp"
android:layout_height="48dp"
android:src="?attr/mediaRouteCastDrawable"
diff --git a/v7/mediarouter/res/layout/mr_media_route_list_item.xml b/v7/mediarouter/res/layout/mr_media_route_list_item.xml
index d07dd6e..a2804ae 100644
--- a/v7/mediarouter/res/layout/mr_media_route_list_item.xml
+++ b/v7/mediarouter/res/layout/mr_media_route_list_item.xml
@@ -39,7 +39,7 @@
android:layout_height="32dp"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?attr/mediaRouteTextStyle"
+ android:textAppearance="?attr/mediaRouteChooserPrimaryTextStyle"
android:duplicateParentState="true" />
<TextView android:id="@android:id/text2"
@@ -47,7 +47,7 @@
android:layout_height="24dp"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?attr/mediaRouteSecondaryTextStyle"
+ android:textAppearance="?attr/mediaRouteChooserSecondaryTextStyle"
android:duplicateParentState="true" />
</LinearLayout>
diff --git a/v7/mediarouter/res/values/attrs.xml b/v7/mediarouter/res/values/attrs.xml
index 56381c7..ca4bd61 100644
--- a/v7/mediarouter/res/values/attrs.xml
+++ b/v7/mediarouter/res/values/attrs.xml
@@ -38,8 +38,12 @@
<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" />
+ <attr name="mediaRouteChooserPrimaryTextStyle" format="reference" />
+ <attr name="mediaRouteChooserSecondaryTextStyle" format="reference" />
+ <attr name="mediaRouteControllerTitleTextStyle" format="reference" />
+ <attr name="mediaRouteControllerPrimaryTextStyle" format="reference" />
+ <attr name="mediaRouteControllerSecondaryTextStyle" format="reference" />
<attr name="mediaRouteExpandGroupDrawable" format="reference" />
<attr name="mediaRouteCollapseGroupDrawable" format="reference" />
+ <attr name="mediaRouteControllerTextStyle" format="reference" />
</resources>
diff --git a/v7/mediarouter/res/values/styles.xml b/v7/mediarouter/res/values/styles.xml
index 8bb9d66..cebe09a 100644
--- a/v7/mediarouter/res/values/styles.xml
+++ b/v7/mediarouter/res/values/styles.xml
@@ -27,32 +27,73 @@
<item name="externalRouteEnabledDrawable">@drawable/mr_ic_media_route_mono_light</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText" parent="">
+ <!-- MediaRouteChooserDialog text styles -->
+ <style name="Widget.MediaRouter.ChooserText" parent="">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText.Primary">
+ <style name="Widget.MediaRouter.ChooserText.Primary">
<item name="android:textSize">18sp</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText.Secondary">
+ <style name="Widget.MediaRouter.ChooserText.Secondary">
<item name="android:textSize">14sp</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText.Primary.Dark">
+ <style name="Widget.MediaRouter.ChooserText.Primary.Dark">
<item name="android:textColor">#FFFFFFFF</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText.Primary.Light">
+ <style name="Widget.MediaRouter.ChooserText.Primary.Light">
<item name="android:textColor">#DE000000</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText.Secondary.Dark">
+ <style name="Widget.MediaRouter.ChooserText.Secondary.Dark">
<item name="android:textColor">#8AFFFFFF</item>
</style>
- <style name="Widget.MediaRouter.MediaRouteText.Secondary.Light">
+ <style name="Widget.MediaRouter.ChooserText.Secondary.Light">
<item name="android:textColor">#8A000000</item>
</style>
+
+ <!-- MediaRouteControllerDialog text styles -->
+ <style name="Widget.MediaRouter.ControllerText" parent="Widget.MediaRouter.ChooserText" />
+
+ <style name="Widget.MediaRouter.ControllerText.Title">
+ <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:textSize">20sp</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Primary">
+ <item name="android:textSize">16sp</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Secondary">
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Title.Dark">
+ <item name="android:textColor">#FFFFFFFF</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Title.Light">
+ <item name="android:textColor">#DE000000</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Primary.Dark">
+ <item name="android:textColor">#FFFFFFFF</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Primary.Light">
+ <item name="android:textColor">#DE000000</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Secondary.Dark">
+ <item name="android:textColor">#FFFFFFFF</item>
+ </style>
+
+ <style name="Widget.MediaRouter.ControllerText.Secondary.Light">
+ <item name="android:textColor">#DE000000</item>
+ </style>
</resources>
diff --git a/v7/mediarouter/res/values/themes.xml b/v7/mediarouter/res/values/themes.xml
index 8c5a072..d742041 100644
--- a/v7/mediarouter/res/values/themes.xml
+++ b/v7/mediarouter/res/values/themes.xml
@@ -31,8 +31,11 @@
<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>
+ <item name="mediaRouteChooserPrimaryTextStyle">@style/Widget.MediaRouter.ChooserText.Primary.Dark</item>
+ <item name="mediaRouteChooserSecondaryTextStyle">@style/Widget.MediaRouter.ChooserText.Secondary.Dark</item>
+ <item name="mediaRouteControllerTitleTextStyle">@style/Widget.MediaRouter.ControllerText.Title.Dark</item>
+ <item name="mediaRouteControllerPrimaryTextStyle">@style/Widget.MediaRouter.ControllerText.Primary.Dark</item>
+ <item name="mediaRouteControllerSecondaryTextStyle">@style/Widget.MediaRouter.ControllerText.Secondary.Dark</item>
<item name="mediaRouteExpandGroupDrawable">@drawable/ic_keyboard_arrow_down_white</item>
<item name="mediaRouteCollapseGroupDrawable">@drawable/ic_keyboard_arrow_up_white</item>
</style>
@@ -51,8 +54,11 @@
<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>
+ <item name="mediaRouteChooserPrimaryTextStyle">@style/Widget.MediaRouter.ChooserText.Primary.Light</item>
+ <item name="mediaRouteChooserSecondaryTextStyle">@style/Widget.MediaRouter.ChooserText.Secondary.Light</item>
+ <item name="mediaRouteControllerTitleTextStyle">@style/Widget.MediaRouter.ControllerText.Title.Light</item>
+ <item name="mediaRouteControllerPrimaryTextStyle">@style/Widget.MediaRouter.ControllerText.Primary.Light</item>
+ <item name="mediaRouteControllerSecondaryTextStyle">@style/Widget.MediaRouter.ControllerText.Secondary.Light</item>
<item name="mediaRouteExpandGroupDrawable">@drawable/ic_keyboard_arrow_down_black</item>
<item name="mediaRouteCollapseGroupDrawable">@drawable/ic_keyboard_arrow_up_black</item>
</style>
