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

Commit 36a5c8d0 authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix alpha keyboard shortcuts with ToolbarActionBar 

Bug: 22651750
Change-Id: I10984cfaa50b8ae283f40a24f612882db613c1a0
parent 07a91c7d

core/java/com/android/internal/app/ToolbarActionBar.java

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.graphics.drawable.Drawable;

import android.view.ActionMode;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -467,6 +468,9 @@ public class ToolbarActionBar extends ActionBar { 
    public boolean onKeyShortcut(int keyCode, KeyEvent event) {

        Menu menu = mDecorToolbar.getMenu();

        if (menu != null) {

            final KeyCharacterMap kmap = KeyCharacterMap.load(

                    event != null ? event.getDeviceId() : KeyCharacterMap.VIRTUAL_KEYBOARD);

            menu.setQwertyMode(kmap.getKeyboardType() != KeyCharacterMap.NUMERIC);

            menu.performShortcut(keyCode, event, 0);

        }

        // This action bar always returns true for handling keyboard shortcuts.