diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-07-21 18:45:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 18:45:10 +0000 |
| commit | c307beac180bd67408289e777ca1a30def3bcec8 (patch) | |
| tree | f606c77377102e0589906d79d9912377bea5c2e8 /InCallUI | |
| parent | ce1a257e8f8c68682cbf3063424f45e0c2c6e1f2 (diff) | |
| parent | 2e46f6b84fd69db43a782a5fbb01448da4f0fef2 (diff) | |
am 56a23363: Merge "Fix white text in audio mode popup (1/2)" into lmp-dev
* commit '56a233631b9949182b90a74f1591fece7142ba55':
Fix white text in audio mode popup (1/2)
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/values/styles.xml | 5 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonFragment.java | 5 |
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); |