diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-07-21 18:42:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-20 04:41:30 +0000 |
| commit | 2e46f6b84fd69db43a782a5fbb01448da4f0fef2 (patch) | |
| tree | cbe81673e85aa8cb81b4f2dda12ecf073d1bcd7f /InCallUI | |
| parent | 3d78d0ff165787a1e4ac4bb8d2f2dcd6879556c9 (diff) | |
| parent | 0cbcae8e281229503a17f0c93913d2d73033799e (diff) | |
Merge "Fix white text in audio mode popup (1/2)" into lmp-dev
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); |