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

* commit '5eaf00641a8dd31b4d7779749db28669e4010af3': Check MenuItem.isVisible() for keyboard shortcuts
2014-10-22 20:14:35 +00:00
parent 2203e532d6 5eaf00641a
commit a0579ad00f
1 changed files with 2 additions and 1 deletions
--- 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);
            }
        }