MediaRouter: Choose a better controller style based on primary color
Change-Id: I7163b12835f8387f90ebc337c63cddbe50f5023e
diff --git a/v7/mediarouter/res/values/themes.xml b/v7/mediarouter/res/values/themes.xml
index da21998..7f46da7 100644
--- a/v7/mediarouter/res/values/themes.xml
+++ b/v7/mediarouter/res/values/themes.xml
@@ -41,6 +41,17 @@
<item name="mediaRouteCollapseGroupDrawable">@drawable/ic_keyboard_arrow_up_white</item>
</style>
+ <style name="Theme.MediaRouter.LightControlPanel">
+ <item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_light</item>
+ <item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_light</item>
+ <item name="mediaRouteCastDrawable">@drawable/mr_ic_cast_light</item>
+ <item name="mediaRouteAudioTrackDrawable">@drawable/ic_audiotrack_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>
+
<style name="Theme.MediaRouter.Light">
<item name="mediaRouteButtonStyle">@style/Widget.MediaRouter.Light.MediaRouteButton</item>
@@ -65,4 +76,15 @@
<item name="mediaRouteCollapseGroupDrawable">@drawable/ic_keyboard_arrow_up_black</item>
</style>
+ <style name="Theme.MediaRouter.Light.DarkControlPanel">
+ <item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_dark</item>
+ <item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_dark</item>
+ <item name="mediaRouteCastDrawable">@drawable/mr_ic_cast_dark</item>
+ <item name="mediaRouteAudioTrackDrawable">@drawable/ic_audiotrack</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>
+
</resources>
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java b/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
index 09999a1..c881357 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
@@ -17,6 +17,7 @@
package android.support.v7.app;
import android.content.Context;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.v7.mediarouter.R;
import android.util.TypedValue;
@@ -27,9 +28,21 @@
}
public static Context createThemedContext(Context context) {
- boolean isLightTheme = isLightTheme(context);
- return new ContextThemeWrapper(context, isLightTheme ?
- R.style.Theme_MediaRouter_Light : R.style.Theme_MediaRouter);
+ int style;
+ if (isLightTheme(context)) {
+ if (isPrimaryColorDark(context)) {
+ style = R.style.Theme_MediaRouter_Light_DarkControlPanel;
+ } else {
+ style = R.style.Theme_MediaRouter_Light;
+ }
+ } else {
+ if (isPrimaryColorDark(context)) {
+ style = R.style.Theme_MediaRouter;
+ } else {
+ style = R.style.Theme_MediaRouter_LightControlPanel;
+ }
+ }
+ return new ContextThemeWrapper(context, style);
}
public static int getThemeResource(Context context, int attr) {
@@ -47,4 +60,20 @@
return context.getTheme().resolveAttribute(R.attr.isLightTheme, value, true)
&& value.data != 0;
}
+
+ private static boolean isPrimaryColorDark(Context context) {
+ TypedValue value = new TypedValue();
+ context.getTheme().resolveAttribute(R.attr.colorPrimary, value, true);
+ return luminance(value.data) < 0.5;
+ }
+
+ private static float luminance(int color) {
+ double red = Color.red(color) / 255.0;
+ red = red < 0.03928 ? red / 12.92 : Math.pow((red + 0.055) / 1.055, 2.4);
+ double green = Color.green(color) / 255.0;
+ green = green < 0.03928 ? green / 12.92 : Math.pow((green + 0.055) / 1.055, 2.4);
+ double blue = Color.blue(color) / 255.0;
+ blue = blue < 0.03928 ? blue / 12.92 : Math.pow((blue + 0.055) / 1.055, 2.4);
+ return (float) ((0.2126 * red) + (0.7152 * green) + (0.0722 * blue));
+ }
}
