diff options
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuItemImpl.java | 8 | ||||
| -rw-r--r-- | core/res/res/layout/action_menu_item_layout.xml | 16 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 1 |
3 files changed, 16 insertions, 9 deletions
diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index f2430e4..1a6cc54 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -19,6 +19,7 @@ package com.android.internal.view.menu; import com.android.internal.view.menu.MenuView.ItemView; import android.content.ActivityNotFoundException; +import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; import android.util.Log; @@ -28,6 +29,7 @@ import android.view.MenuItem; import android.view.SubMenu; import android.view.View; import android.view.ViewDebug; +import android.widget.LinearLayout; /** * @hide @@ -554,9 +556,9 @@ public final class MenuItemImpl implements MenuItem { } public MenuItem setActionView(int resId) { - LayoutInflater inflater = LayoutInflater.from(mMenu.getContext()); - // TODO - Fix for proper parent. Lazily inflate in the presenter. - setActionView(inflater.inflate(resId, null)); + final Context context = mMenu.getContext(); + final LayoutInflater inflater = LayoutInflater.from(context); + setActionView(inflater.inflate(resId, new LinearLayout(context))); return this; } diff --git a/core/res/res/layout/action_menu_item_layout.xml b/core/res/res/layout/action_menu_item_layout.xml index 5e828fa..4206dcb 100644 --- a/core/res/res/layout/action_menu_item_layout.xml +++ b/core/res/res/layout/action_menu_item_layout.xml @@ -19,19 +19,20 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:addStatesFromChildren="true" - android:background="?attr/selectableItemBackground" android:gravity="center" + android:focusable="true" android:paddingLeft="12dip" android:paddingRight="12dip" - android:minWidth="64dip" - android:minHeight="?attr/actionBarSize" - android:focusable="true"> + style="?android:attr/actionButtonStyle"> <ImageButton android:id="@+id/imageButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:visibility="gone" - android:padding="@dimen/action_bar_icon_vertical_padding" + android:paddingTop="@dimen/action_bar_icon_vertical_padding" + android:paddingBottom="@dimen/action_bar_icon_vertical_padding" + android:paddingLeft="4dip" + android:paddingRight="4dip" android:scaleType="fitCenter" android:adjustViewBounds="true" android:background="@null" @@ -45,6 +46,9 @@ style="?attr/buttonStyleSmall" android:textColor="?attr/actionMenuTextColor" android:background="@null" - android:padding="4dip" + android:paddingTop="4dip" + android:paddingBottom="4dip" + android:paddingLeft="4dip" + android:paddingRight="4dip" android:focusable="false" /> </com.android.internal.view.menu.ActionMenuItemView> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index b85d4cf..dc86626 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1121,6 +1121,7 @@ <item name="android:paddingLeft">16dip</item> <item name="android:paddingRight">16dip</item> <item name="android:minWidth">64dip</item> + <item name="android:minHeight">?android:attr/actionBarSize</item> </style> <style name="Widget.ActionButton.Overflow"> |