diff options
| author | Adam Powell <adamp@google.com> | 2010-08-03 15:51:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-03 15:51:25 -0700 |
| commit | 9d67668b9ba3284a16b1e6f6f8cca53e2172f8f6 (patch) | |
| tree | 905f441ebb03d0f1fe7cce76d7f225778ef9b306 /core/res | |
| parent | 374b4d90914b9b78aec648df4831c33ee82131d1 (diff) | |
| parent | 1f9c7afc5a06576e327a4b1c12688202f53d9462 (diff) | |
| download | frameworks_base-9d67668b9ba3284a16b1e6f6f8cca53e2172f8f6.zip frameworks_base-9d67668b9ba3284a16b1e6f6f8cca53e2172f8f6.tar.gz frameworks_base-9d67668b9ba3284a16b1e6f6f8cca53e2172f8f6.tar.bz2 | |
Merge "Add support for action buttons without an icon."
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/action_menu_item_layout.xml | 13 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/core/res/res/layout/action_menu_item_layout.xml b/core/res/res/layout/action_menu_item_layout.xml index 3f06251..0d3cce5 100644 --- a/core/res/res/layout/action_menu_item_layout.xml +++ b/core/res/res/layout/action_menu_item_layout.xml @@ -16,5 +16,14 @@ <com.android.internal.view.menu.ActionMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> + android:layout_height="wrap_content" > + <ImageButton android:id="@+id/imageButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + style="?attr/actionButtonStyle" /> + <Button android:id="@+id/textButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" /> +</com.android.internal.view.menu.ActionMenuItemView> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 3c09a89..993048d 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -882,5 +882,6 @@ </style> <style name="Widget.ActionButton"> + <item name="android:background">@null</item> </style> </resources> |