Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5307916 - legacy menu theming"

Browse Source
This commit is contained in:
Adam Powell
2011-09-13 16:02:38 -07:00
committed by Android (Google) Code Review
parent 03c2a00507 bc83503999
commit e0946eb270
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/view/menu/ListMenuPresenter.java
View File

@@ -62,6 +62,7 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
public ListMenuPresenter(Context context, int itemLayoutRes) { public ListMenuPresenter(Context context, int itemLayoutRes) {
this(itemLayoutRes, 0); this(itemLayoutRes, 0);
mContext = context; mContext = context;
mInflater = LayoutInflater.from(mContext);
} }
/** /**
@@ -78,10 +79,13 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
public void initForMenu(Context context, MenuBuilder menu) { public void initForMenu(Context context, MenuBuilder menu) {
if (mThemeRes != 0) { if (mThemeRes != 0) {
mContext = new ContextThemeWrapper(context, mThemeRes); mContext = new ContextThemeWrapper(context, mThemeRes);
mInflater = LayoutInflater.from(mContext);
} else if (mContext != null) { } else if (mContext != null) {
mContext = context; mContext = context;
if (mInflater == null) {
mInflater = LayoutInflater.from(mContext);
}
} }
mInflater = LayoutInflater.from(mContext);
mMenu = menu; mMenu = menu;
} }

4
core/res/res/layout/list_menu_item_layout.xml
View File

@@ -26,8 +26,8 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="16dip" android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginRight="16dip" android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
android:duplicateParentState="true"> android:duplicateParentState="true">
<TextView <TextView

5
core/res/res/values/themes.xml
View File

@@ -616,6 +616,9 @@ please see themes_device_defaults.xml.
<item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item> <item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item>
<item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item> <item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item>
<item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item> <item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item>
<item name="listPreferredItemPaddingLeft">10dip</item>
<item name="listPreferredItemPaddingRight">10dip</item>
</style> </style>
<!-- Variation of Theme.Dialog that does not include a frame (or background). <!-- Variation of Theme.Dialog that does not include a frame (or background).
@@ -640,6 +643,8 @@ please see themes_device_defaults.xml.
<item name="windowTitleStyle">@android:style/DialogWindowTitle</item> <item name="windowTitleStyle">@android:style/DialogWindowTitle</item>
<item name="windowContentOverlay">@null</item> <item name="windowContentOverlay">@null</item>
<item name="itemTextAppearance">@android:style/TextAppearance.Large.Inverse</item> <item name="itemTextAppearance">@android:style/TextAppearance.Large.Inverse</item>
<item name="textAppearanceListItem">@android:style/TextAppearance.Large.Inverse</item>
<item name="textAppearanceListItemSmall">@android:style/TextAppearance.Large.Inverse</item>
</style> </style>
<!-- Default dark theme for panel windows. This removes all extraneous <!-- Default dark theme for panel windows. This removes all extraneous