commit f8741721fe0e888e99c57993272bbcb458b43568
author Yorke Lee <yorkelee@google.com> Mon Jul 21 11:37:53 2014 -0700
committer The Android Automerger <android-build@google.com> Mon Jul 21 14:53:32 2014 -0700
tree 7089723b04efe1b577725efd1f64103f4cac69dc
parent bfb48c19b99fb1e2412f9c722f6f55a967c45233

Fix white text in audio mode popup (1/2)

Bug: 15643498
Change-Id: I3d9205eb99b42b95e6a05d07039995277f8e29c6

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 85a75dd..b2231da 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -124,5 +124,10 @@
         <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
         <item name="android:textColorPrimary">@color/incall_call_banner_text_color</item>
         <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item>
+        <item name="android:popupMenuStyle">@style/InCallPopupMenuStyle</item>
+    </style>
+
+    <style name="InCallPopupMenuStyle" parent="@android:style/Theme.Material.Light">
+        <item name="android:textColorPrimary">@color/popup_menu_color</item>
     </style>
 </resources>

src/com/android/incallui/CallButtonFragment.java

diff --git a/src/com/android/incallui/CallButtonFragment.java b/src/com/android/incallui/CallButtonFragment.java
index 93bb001..077c812 100644
--- a/src/com/android/incallui/CallButtonFragment.java
+++ b/src/com/android/incallui/CallButtonFragment.java
@@ -18,6 +18,7 @@
 
 import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -492,7 +493,9 @@
     private void showAudioModePopup() {
         Log.d(this, "showAudioPopup()...");
 
-        mAudioModePopup = new PopupMenu(getView().getContext(), mAudioButton /* anchorView */);
+        final ContextThemeWrapper contextWrapper = new ContextThemeWrapper(getActivity(),
+                R.style.InCallPopupMenuStyle);
+        mAudioModePopup = new PopupMenu(contextWrapper, mAudioButton /* anchorView */);
         mAudioModePopup.getMenuInflater().inflate(R.menu.incall_audio_mode_menu,
                 mAudioModePopup.getMenu());
         mAudioModePopup.setOnMenuItemClickListener(this);