summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-21 11:37:53 -0700
committerYorke Lee <yorkelee@google.com>2014-07-21 11:37:53 -0700
commit0cbcae8e281229503a17f0c93913d2d73033799e (patch)
treeb2d746c06aafc58811014a15b1470d791008b1b0
parentb6f45c2768f5af916ee3257542a3ab03611c1f5e (diff)
Fix white text in audio mode popup (1/2)
Bug: 15643498 Change-Id: I3d9205eb99b42b95e6a05d07039995277f8e29c6
-rw-r--r--InCallUI/res/values/styles.xml5
-rw-r--r--InCallUI/src/com/android/incallui/CallButtonFragment.java5
2 files changed, 9 insertions, 1 deletions
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 85a75dd1d..b2231da66 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/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>
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index 93bb00145..077c8124b 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -18,6 +18,7 @@ package com.android.incallui;
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 @@ public class CallButtonFragment
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);