Commit b4d74aa1 authored Oct 23, 2014 by Alan Viverette Committed by Android Git Automerger Oct 23, 2014

am 1338a8bd: am dc546ab7: am 720f43e4: Merge "Revert "Check...

am 1338a8bd: am dc546ab7: am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev

* commit '1338a8bd':
  Revert "Check MenuItem.isVisible() for keyboard shortcuts"

parents c3947117 1338a8bd

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -828,8 +828,7 @@ public class MenuBuilder implements Menu {
		\|\| shortcutChar == possibleChars.meta[2]
		\|\| (qwerty && shortcutChar == '\b' &&
		keyCode == KeyEvent.KEYCODE_DEL)) &&
		item.isEnabled() &&
		item.isVisible()) {
		item.isEnabled()) {
		items.add(item);
		}
		}