commit 5eaf00641a8dd31b4d7779749db28669e4010af3
author Alan Viverette <alanv@google.com> Wed Oct 22 20:08:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 22 20:08:02 2014 +0000
tree f7db1b4eda08ba96a594460c53fdcee922c2c483
parent 281763ba1b4a6255799046f78930b586cd7e541c
parent 410f7ee4031bb754600ad9c984158b6ff4f056c8

am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev

* commit '410f7ee4031bb754600ad9c984158b6ff4f056c8':
  Check MenuItem.isVisible() for keyboard shortcuts

core/java/com/android/internal/view/menu/MenuBuilder.java

diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java
index e8d1ead..e5f9ec9 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 @@
                       || shortcutChar == possibleChars.meta[2]
                       || (qwerty && shortcutChar == '\b' &&
                           keyCode == KeyEvent.KEYCODE_DEL)) &&
-                  item.isEnabled()) {
+                  item.isEnabled() &&
+                  item.isVisible()) {
                 items.add(item);
             }
         }