From e354a9e4da56da45d7035e1e93301554c5faf32e Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 21 Oct 2014 12:21:32 -0700 Subject: [PATCH] Check MenuItem.isVisible() for keyboard shortcuts Parity with support-v7 change. BUG: 18021345 Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59 --- core/java/com/android/internal/view/menu/MenuBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java index e8d1ead7d6514..e5f9ec9951bf6 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); } }