Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev

Browse Source 
am: 7ecd40c1fc

Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
This commit is contained in:
Michael Wright
2017-04-12 14:23:20 +00:00
committed by android-build-merger
parent 0b512f27be 7ecd40c1fc
commit 719d1f06fb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/policy/DecorView.java
View File

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