Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev (410f7ee4) · Commits · e / os / android_frameworks_base

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

+2 −1

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