Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev

am: 29ea814354

Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a
This commit is contained in:
Oren Blasberg
2016-06-28 21:20:02 +00:00
committed by android-build-merger

View File

@@ -318,6 +318,7 @@ please see themes_device_defaults.xml.
<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>