Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77838724 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

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

am: 719d1f06

Change-Id: Ib6c86d95d893d306de897ce31b07456fc17a124f
parents 9c58d46e 719d1f06

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);

        }

    }