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 am: 7ecd40c1fc

Browse Source 
am: 719d1f06fb

Change-Id: Ib6c86d95d893d306de897ce31b07456fc17a124f
This commit is contained in:
Michael Wright
2017-04-12 14:28:27 +00:00
committed by android-build-merger
parent 9c58d46e1d 719d1f06fb
commit 7783872441
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
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);
}
}