summaryrefslogtreecommitdiffstats
path: root/core/res/res
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-03-24 15:34:54 -0700
committerAdam Powell <adamp@google.com>2011-03-24 15:56:07 -0700
commit6bddd8771d05889024778caa78fb1eaae68a0802 (patch)
treeae0cfe3856a09572ea7816358badf2df6043ecb0 /core/res/res
parent3224fac18c83ac6b3ad9e5dc3354f0d100f50055 (diff)
downloadframeworks_base-6bddd8771d05889024778caa78fb1eaae68a0802.zip
frameworks_base-6bddd8771d05889024778caa78fb1eaae68a0802.tar.gz
frameworks_base-6bddd8771d05889024778caa78fb1eaae68a0802.tar.bz2
Fix bug 4084399 - with usb keyboard, actionbar menuitems with
icon+text take dpad focus twice in row Fix action menu item layout focusability so that only the full item is focusable. Fix up listeners appropriately. Change-Id: I127c36404894869a08c5f4472491e3e596563c5c
Diffstat (limited to 'core/res/res')
-rw-r--r--core/res/res/layout/action_menu_item_layout.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/res/res/layout/action_menu_item_layout.xml b/core/res/res/layout/action_menu_item_layout.xml
index 15dfea3..4a73368 100644
--- a/core/res/res/layout/action_menu_item_layout.xml
+++ b/core/res/res/layout/action_menu_item_layout.xml
@@ -24,7 +24,8 @@
android:paddingLeft="12dip"
android:paddingRight="12dip"
android:minWidth="64dip"
- android:minHeight="?attr/actionBarSize">
+ android:minHeight="?attr/actionBarSize"
+ android:focusable="true">
<ImageButton android:id="@+id/imageButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -34,7 +35,8 @@
android:paddingRight="4dip"
android:minHeight="56dip"
android:scaleType="center"
- android:background="@null" />
+ android:background="@null"
+ android:focusable="false" />
<Button android:id="@+id/textButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -45,5 +47,6 @@
android:textColor="?attr/actionMenuTextColor"
android:background="@null"
android:paddingLeft="4dip"
- android:paddingRight="4dip" />
+ android:paddingRight="4dip"
+ android:focusable="false" />
</com.android.internal.view.menu.ActionMenuItemView>