Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 931ee784 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Ensure that popupTheme is always specified in the top-level theme." into pi-dev 

am: 41d7d89c

Change-Id: I3f11c07aca70f2efb723d0706ae47dffa0f5243f
parents dbc92ba1 41d7d89c

core/res/res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ please see themes_device_defaults.xml. 
        <item name="quickContactBadgeStyleSmallWindowLarge">@style/Widget.QuickContactBadgeSmall.WindowLarge</item>

        <item name="listPopupWindowStyle">@style/Widget.ListPopupWindow</item>

        <item name="popupMenuStyle">@style/Widget.PopupMenu</item>

        <item name="popupTheme">@null</item>

        <item name="activityChooserViewStyle">@style/Widget.ActivityChooserView</item>

        <item name="fragmentBreadCrumbsStyle">@style/Widget.FragmentBreadCrumbs</item>

        <item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>

core/res/res/values/themes_holo.xml

+3 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ please see themes_device_defaults.xml. 
        <item name="quickContactBadgeStyleSmallWindowLarge">@style/Widget.Holo.QuickContactBadgeSmall.WindowLarge</item>

        <item name="listPopupWindowStyle">@style/Widget.Holo.ListPopupWindow</item>

        <item name="popupMenuStyle">@style/Widget.Holo.PopupMenu</item>

        <item name="popupTheme">@null</item>

        <item name="stackViewStyle">@style/Widget.Holo.StackView</item>

        <item name="activityChooserViewStyle">@style/Widget.Holo.ActivityChooserView</item>

        <item name="fragmentBreadCrumbsStyle">@style/Widget.Holo.FragmentBreadCrumbs</item>
@@ -658,9 +659,11 @@ please see themes_device_defaults.xml. 
        <item name="quickContactBadgeStyleSmallWindowLarge">@style/Widget.Holo.QuickContactBadgeSmall.WindowLarge</item>

        <item name="listPopupWindowStyle">@style/Widget.Holo.Light.ListPopupWindow</item>

        <item name="popupMenuStyle">@style/Widget.Holo.Light.PopupMenu</item>

        <item name="popupTheme">@null</item>

        <item name="stackViewStyle">@style/Widget.Holo.StackView</item>

        <item name="activityChooserViewStyle">@style/Widget.Holo.Light.ActivityChooserView</item>

        <item name="fragmentBreadCrumbsStyle">@style/Widget.Holo.Light.FragmentBreadCrumbs</item>

        <item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>



        <!-- Preference styles -->

        <item name="preferenceScreenStyle">@style/Preference.Holo.PreferenceScreen</item>