summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-10-21 12:21:32 -0700
committer Alan Viverette <alanv@google.com> 2014-10-21 12:21:32 -0700
commite354a9e4da56da45d7035e1e93301554c5faf32e (patch)
tree3ee87e0d379331574b27839b5a4650940a0cdfac
parentcc8b3e8d4e561026cf673c9a234cc151f17b3362 (diff)
Check MenuItem.isVisible() for keyboard shortcuts
Parity with support-v7 change. BUG: 18021345 Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
-rw-r--r--core/java/com/android/internal/view/menu/MenuBuilder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java
index e8d1ead7d651..e5f9ec9951bf 100644
--- a/core/java/com/android/internal/view/menu/MenuBuilder.java
+++ b/core/java/com/android/internal/view/menu/MenuBuilder.java
@@ -828,7 +828,8 @@ public class MenuBuilder implements Menu {
|| shortcutChar == possibleChars.meta[2]
|| (qwerty && shortcutChar == '\b' &&
keyCode == KeyEvent.KEYCODE_DEL)) &&
- item.isEnabled()) {
+ item.isEnabled() &&
+ item.isVisible()) {
items.add(item);
}
}