commit af77901e2c29580384aa7fa7c55f10d2125f2db3
author Jae Seo <jaeseo@google.com> Thu Sep 24 10:15:34 2015 -0700
committer Jae Seo <jaeseo@google.com> Thu Sep 24 10:15:34 2015 -0700
tree dd0b094c4ae96ec8fe14df2e936cb98ca15bd844
parent 4dad94619cf10f5115dc91c36c48741e005c58b9

MediaRouter: Use colorAccent for default dialog button text

Change-Id: I322d9a601c035b6dd3176d871e689a1a224aae0e

v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java

diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java b/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
index 5d86448..f3698bf 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouterThemeHelper.java
@@ -65,17 +65,13 @@
     }
 
     public static int getButtonTextColor(Context context) {
-        int primaryColor = getPrimaryColor(context);
-
-        TypedValue value = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorBackground, value, true);
-        int backgroundColor = context.getResources().getColor(value.resourceId);
+        int primaryColor = getThemeColor(context, R.attr.colorPrimary);
+        int backgroundColor = getThemeColor(context, android.R.attr.colorBackground);
 
         double contrast = ColorUtils.calculateContrast(primaryColor, backgroundColor);
         if (contrast < MIN_CONTRAST_BUTTON_TEXT) {
-            // Default to textColorPrimary if the contrast ratio is low.
-            context.getTheme().resolveAttribute(android.R.attr.textColorPrimary, value, true);
-            return context.getResources().getColor(value.resourceId);
+            // Default to colorAccent if the contrast ratio is low.
+            return getThemeColor(context, R.attr.colorAccent);
         }
         return primaryColor;
     }
@@ -87,13 +83,16 @@
     }
 
     private static boolean isPrimaryColorLight(Context context) {
-        int primaryColor = getPrimaryColor(context);
+        int primaryColor = getThemeColor(context, R.attr.colorPrimary);
         return ColorUtils.calculateLuminance(primaryColor) >= 0.5;
     }
 
-    private static int getPrimaryColor(Context context) {
+    private static int getThemeColor(Context context, int attr) {
         TypedValue value = new TypedValue();
-        context.getTheme().resolveAttribute(R.attr.colorPrimary, value, true);
+        context.getTheme().resolveAttribute(attr, value, true);
+        if (value.resourceId != 0) {
+            return context.getResources().getColor(value.resourceId);
+        }
         return value.data;
     }
 }