commit 9585012ce39c4e2d1fbd78dac5304bd2506e2049
author Oren Blasberg <orenb@google.com> Tue Jun 28 21:20:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 28 21:20:02 2016 +0000
tree 74b1a9b8ef1dbd9671dc4f3bc5f5f0840fd26e42
parent b1400b142e01ea95bcfde24efbc9d564ce9146b6
parent 29ea814354b479a124e4202ca779e7c47502a97c

Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am: 29ea814354

Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a

core/res/res/values/themes.xml

diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 92f049d..5b2522f 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -318,6 +318,7 @@
         <item name="activityChooserViewStyle">@style/Widget.ActivityChooserView</item>
         <item name="mediaRouteButtonStyle">@style/Widget.DeviceDefault.MediaRouteButton</item>
         <item name="fragmentBreadCrumbsStyle">@style/Widget.FragmentBreadCrumbs</item>
+        <item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>
 
         <!-- Preference styles -->
         <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item>