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

Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb

Browse Source
This commit is contained in:
Adam Powell
2011-01-07 11:35:15 -08:00
committed by Android (Google) Code Review
parent fe75027c5c d16c9884bb
commit 26c0c77220
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/view/menu/ActionMenuView.java
View File

@@ -187,17 +187,6 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
final MenuItemImpl itemData = itemsToShow.get(i);
View actionView = itemData.getActionView();
if (actionView == null) {
// Check for a layout ID instead
final int layoutId = itemData.getActionViewId();
if (layoutId != 0) {
LayoutInflater inflater = LayoutInflater.from(getContext());
actionView = inflater.inflate(layoutId, this, false);
itemData.setActionView(0);
itemData.setActionView(actionView);
}
}
if (actionView != null) {
final ViewParent parent = actionView.getParent();
if (parent instanceof ViewGroup) {

9
core/java/com/android/internal/view/menu/MenuItemImpl.java
View File

@@ -83,7 +83,6 @@ public final class MenuItemImpl implements MenuItem {
private int mShowAsAction = SHOW_AS_ACTION_NEVER;
private View mActionView;
private int mActionViewId;
/** Used for the icon resource ID if this item does not have an icon */
static final int NO_ICON = 0;
@@ -696,15 +695,13 @@ public final class MenuItemImpl implements MenuItem {
}
public MenuItem setActionView(int resId) {
mActionViewId = resId;
LayoutInflater inflater = LayoutInflater.from(mMenu.getContext());
ViewGroup parent = (ViewGroup) mMenu.getMenuView(MenuBuilder.TYPE_ACTION_BUTTON, null);
setActionView(inflater.inflate(resId, parent, false));
return this;
}
public View getActionView() {
return mActionView;
}
public int getActionViewId() {
return mActionViewId;
}
}