Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev (719d1f06) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DecorView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -2263,8 +2263,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		@Override
		public void requestKeyboardShortcuts(List<KeyboardShortcutGroup> list, int deviceId) {
		final PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false);
		if (!mWindow.isDestroyed() && st != null && mWindow.getCallback() != null) {
		mWindow.getCallback().onProvideKeyboardShortcuts(list, st.menu, deviceId);
		final Menu menu = st != null ? st.menu : null;
		if (!mWindow.isDestroyed() && mWindow.getCallback() != null) {
		mWindow.getCallback().onProvideKeyboardShortcuts(list, menu, deviceId);
		}
		}