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

Commit b999af5b authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Make Keyboard Shortcuts special names Context dependent 

These were static, but since we load Strings from a given context
we should load them each time (e.g. Locale might have changed).

Bug: 28035606
Change-Id: I3dd654c29a2632bfd93ea791457fac5d9d0f6aa8
parent 70f08d9e

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+124 −128
Original line number Diff line number Diff line
@@ -58,193 +58,189 @@ import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; 
 */

public final class KeyboardShortcuts {

    private static final String TAG = KeyboardShortcuts.class.getSimpleName();

    private static final SparseArray<String> SPECIAL_CHARACTER_NAMES = new SparseArray<>();

    private static final SparseArray<Drawable> SPECIAL_CHARACTER_DRAWABLES = new SparseArray<>();

    private static final SparseArray<String> MODIFIER_NAMES = new SparseArray<>();

    private static final SparseArray<Drawable> MODIFIER_DRAWABLES = new SparseArray<>();

    private static boolean resourcesLoaded = false;



    private static void loadResources(Context context) {

        SPECIAL_CHARACTER_NAMES.put(

    private final SparseArray<String> mSpecialCharacterNames = new SparseArray<>();

    private final SparseArray<String> mModifierNames = new SparseArray<>();

    private final SparseArray<Drawable> mSpecialCharacterDrawables = new SparseArray<>();

    private final SparseArray<Drawable> mModifierDrawables = new SparseArray<>();



    private final Handler mHandler = new Handler(Looper.getMainLooper());

    private final Context mContext;

    private final OnClickListener dialogCloseListener =  new DialogInterface.OnClickListener() {

        public void onClick(DialogInterface dialog, int id) {

            dismissKeyboardShortcutsDialog();

        }

    };



    private Dialog mKeyboardShortcutsDialog;

    private KeyCharacterMap mKeyCharacterMap;



    public KeyboardShortcuts(Context context) {

        this.mContext = new ContextThemeWrapper(context, android.R.style.Theme_Material_Light);

        loadResources(context);

    }



    private void loadResources(Context context) {

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_HOME, context.getString(R.string.keyboard_key_home));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_BACK, context.getString(R.string.keyboard_key_back));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_DPAD_UP, context.getString(R.string.keyboard_key_dpad_up));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_DPAD_DOWN, context.getString(R.string.keyboard_key_dpad_down));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_DPAD_LEFT, context.getString(R.string.keyboard_key_dpad_left));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_DPAD_RIGHT, context.getString(R.string.keyboard_key_dpad_right));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_DPAD_CENTER, context.getString(R.string.keyboard_key_dpad_center));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_PERIOD, ".");

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_PERIOD, ".");

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_TAB, context.getString(R.string.keyboard_key_tab));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_SPACE, context.getString(R.string.keyboard_key_space));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_ENTER, context.getString(R.string.keyboard_key_enter));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_DEL, context.getString(R.string.keyboard_key_backspace));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,

                context.getString(R.string.keyboard_key_media_play_pause));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_MEDIA_STOP, context.getString(R.string.keyboard_key_media_stop));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_MEDIA_NEXT, context.getString(R.string.keyboard_key_media_next));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_MEDIA_PREVIOUS,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_MEDIA_PREVIOUS,

                context.getString(R.string.keyboard_key_media_previous));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_MEDIA_REWIND,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_MEDIA_REWIND,

                context.getString(R.string.keyboard_key_media_rewind));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,

                context.getString(R.string.keyboard_key_media_fast_forward));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_PAGE_UP, context.getString(R.string.keyboard_key_page_up));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_PAGE_DOWN, context.getString(R.string.keyboard_key_page_down));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_A,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_A,

                context.getString(R.string.keyboard_key_button_template, "A"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_B,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_B,

                context.getString(R.string.keyboard_key_button_template, "B"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_C,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_C,

                context.getString(R.string.keyboard_key_button_template, "C"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_X,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_X,

                context.getString(R.string.keyboard_key_button_template, "X"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_Y,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_Y,

                context.getString(R.string.keyboard_key_button_template, "Y"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_Z,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_Z,

                context.getString(R.string.keyboard_key_button_template, "Z"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_L1,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_L1,

                context.getString(R.string.keyboard_key_button_template, "L1"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_R1,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_R1,

                context.getString(R.string.keyboard_key_button_template, "R1"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_L2,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_L2,

                context.getString(R.string.keyboard_key_button_template, "L2"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_R2,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_R2,

                context.getString(R.string.keyboard_key_button_template, "R2"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_START,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_START,

                context.getString(R.string.keyboard_key_button_template, "Start"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_SELECT,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_SELECT,

                context.getString(R.string.keyboard_key_button_template, "Select"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BUTTON_MODE,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BUTTON_MODE,

                context.getString(R.string.keyboard_key_button_template, "Mode"));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_FORWARD_DEL, context.getString(R.string.keyboard_key_forward_del));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_ESCAPE, "Esc");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_SYSRQ, "SysRq");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_BREAK, "Break");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_SCROLL_LOCK, "Scroll Lock");

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_ESCAPE, "Esc");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_SYSRQ, "SysRq");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_BREAK, "Break");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_SCROLL_LOCK, "Scroll Lock");

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_MOVE_HOME, context.getString(R.string.keyboard_key_move_home));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_MOVE_END, context.getString(R.string.keyboard_key_move_end));

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_INSERT, context.getString(R.string.keyboard_key_insert));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F1, "F1");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F2, "F2");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F3, "F3");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F4, "F4");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F5, "F5");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F6, "F6");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F7, "F7");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F8, "F8");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F9, "F9");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F10, "F10");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F11, "F11");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_F12, "F12");

        SPECIAL_CHARACTER_NAMES.put(

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F1, "F1");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F2, "F2");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F3, "F3");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F4, "F4");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F5, "F5");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F6, "F6");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F7, "F7");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F8, "F8");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F9, "F9");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F10, "F10");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F11, "F11");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_F12, "F12");

        mSpecialCharacterNames.put(

                KeyEvent.KEYCODE_NUM_LOCK, context.getString(R.string.keyboard_key_num_lock));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_0,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_0,

                context.getString(R.string.keyboard_key_numpad_template, "0"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_1,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_1,

                context.getString(R.string.keyboard_key_numpad_template, "1"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_2,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_2,

                context.getString(R.string.keyboard_key_numpad_template, "2"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_3,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_3,

                context.getString(R.string.keyboard_key_numpad_template, "3"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_4,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_4,

                context.getString(R.string.keyboard_key_numpad_template, "4"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_5,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_5,

                context.getString(R.string.keyboard_key_numpad_template, "5"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_6,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_6,

                context.getString(R.string.keyboard_key_numpad_template, "6"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_7,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_7,

                context.getString(R.string.keyboard_key_numpad_template, "7"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_8,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_8,

                context.getString(R.string.keyboard_key_numpad_template, "8"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_9,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_9,

                context.getString(R.string.keyboard_key_numpad_template, "9"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_DIVIDE,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_DIVIDE,

                context.getString(R.string.keyboard_key_numpad_template, "/"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_MULTIPLY,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_MULTIPLY,

                context.getString(R.string.keyboard_key_numpad_template, "*"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_SUBTRACT,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_SUBTRACT,

                context.getString(R.string.keyboard_key_numpad_template, "-"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_ADD,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_ADD,

                context.getString(R.string.keyboard_key_numpad_template, "+"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_DOT,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_DOT,

                context.getString(R.string.keyboard_key_numpad_template, "."));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_COMMA,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_COMMA,

                context.getString(R.string.keyboard_key_numpad_template, ","));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_ENTER,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_ENTER,

                context.getString(R.string.keyboard_key_numpad_template,

                        context.getString(R.string.keyboard_key_enter)));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_EQUALS,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_EQUALS,

                context.getString(R.string.keyboard_key_numpad_template, "="));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN,

                context.getString(R.string.keyboard_key_numpad_template, "("));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN,

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN,

                context.getString(R.string.keyboard_key_numpad_template, ")"));

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_ZENKAKU_HANKAKU, "半角/全角");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_EISU, "英数");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_MUHENKAN, "無変換");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_HENKAN, "変換");

        SPECIAL_CHARACTER_NAMES.put(KeyEvent.KEYCODE_KATAKANA_HIRAGANA, "かな");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_ZENKAKU_HANKAKU, "半角/全角");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_EISU, "英数");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_MUHENKAN, "無変換");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_HENKAN, "変換");

        mSpecialCharacterNames.put(KeyEvent.KEYCODE_KATAKANA_HIRAGANA, "かな");



        SPECIAL_CHARACTER_DRAWABLES.put(

        mModifierNames.put(KeyEvent.META_META_ON, "Meta");

        mModifierNames.put(KeyEvent.META_CTRL_ON, "Ctrl");

        mModifierNames.put(KeyEvent.META_ALT_ON, "Alt");

        mModifierNames.put(KeyEvent.META_SHIFT_ON, "Shift");

        mModifierNames.put(KeyEvent.META_SYM_ON, "Sym");

        mModifierNames.put(KeyEvent.META_FUNCTION_ON, "Fn");



        mSpecialCharacterDrawables.put(

                KeyEvent.KEYCODE_DEL, context.getDrawable(R.drawable.ic_ksh_key_backspace));

        SPECIAL_CHARACTER_DRAWABLES.put(

        mSpecialCharacterDrawables.put(

                KeyEvent.KEYCODE_ENTER, context.getDrawable(R.drawable.ic_ksh_key_enter));

        SPECIAL_CHARACTER_DRAWABLES.put(

        mSpecialCharacterDrawables.put(

                KeyEvent.KEYCODE_DPAD_UP, context.getDrawable(R.drawable.ic_ksh_key_up));

        SPECIAL_CHARACTER_DRAWABLES.put(

        mSpecialCharacterDrawables.put(

                KeyEvent.KEYCODE_DPAD_RIGHT, context.getDrawable(R.drawable.ic_ksh_key_right));

        SPECIAL_CHARACTER_DRAWABLES.put(

        mSpecialCharacterDrawables.put(

                KeyEvent.KEYCODE_DPAD_DOWN, context.getDrawable(R.drawable.ic_ksh_key_down));

        SPECIAL_CHARACTER_DRAWABLES.put(

        mSpecialCharacterDrawables.put(

                KeyEvent.KEYCODE_DPAD_LEFT, context.getDrawable(R.drawable.ic_ksh_key_left));



        MODIFIER_NAMES.put(KeyEvent.META_META_ON, "Meta");

        MODIFIER_NAMES.put(KeyEvent.META_CTRL_ON, "Ctrl");

        MODIFIER_NAMES.put(KeyEvent.META_ALT_ON, "Alt");

        MODIFIER_NAMES.put(KeyEvent.META_SHIFT_ON, "Shift");

        MODIFIER_NAMES.put(KeyEvent.META_SYM_ON, "Sym");

        MODIFIER_NAMES.put(KeyEvent.META_FUNCTION_ON, "Fn");



        MODIFIER_DRAWABLES.put(

        mModifierDrawables.put(

                KeyEvent.META_META_ON, context.getDrawable(R.drawable.ic_ksh_key_meta));



        resourcesLoaded = true;

    }



    private final Handler mHandler = new Handler(Looper.getMainLooper());

    private final Context mContext;

    private final OnClickListener dialogCloseListener =  new DialogInterface.OnClickListener() {

        public void onClick(DialogInterface dialog, int id) {

            dismissKeyboardShortcutsDialog();

        }

    };



    private Dialog mKeyboardShortcutsDialog;

    private KeyCharacterMap mKeyCharacterMap;



    public KeyboardShortcuts(Context context) {

        this.mContext = new ContextThemeWrapper(context, android.R.style.Theme_Material_Light);

        if (!resourcesLoaded) {

            loadResources(context);

        }

    }



    public void toggleKeyboardShortcuts(int deviceId) {
@@ -458,10 +454,10 @@ public final class KeyboardShortcuts { 
        Drawable displayLabelDrawable = null;

        if (info.getBaseCharacter() > Character.MIN_VALUE) {

            displayLabelString = String.valueOf(info.getBaseCharacter());

        } else if (SPECIAL_CHARACTER_DRAWABLES.get(info.getKeycode()) != null) {

            displayLabelDrawable = SPECIAL_CHARACTER_DRAWABLES.get(info.getKeycode());

        } else if (SPECIAL_CHARACTER_NAMES.get(info.getKeycode()) != null) {

            displayLabelString = SPECIAL_CHARACTER_NAMES.get(info.getKeycode());

        } else if (mSpecialCharacterDrawables.get(info.getKeycode()) != null) {

            displayLabelDrawable = mSpecialCharacterDrawables.get(info.getKeycode());

        } else if (mSpecialCharacterNames.get(info.getKeycode()) != null) {

            displayLabelString = mSpecialCharacterNames.get(info.getKeycode());

        } else {

            // Special case for shortcuts with no base key or keycode.

            if (info.getKeycode() == KeyEvent.KEYCODE_UNKNOWN) {
@@ -491,15 +487,15 @@ public final class KeyboardShortcuts { 
        if (modifiers == 0) {

            return shortcutKeys;

        }

        for(int i = 0; i < MODIFIER_NAMES.size(); ++i) {

            final int supportedModifier = MODIFIER_NAMES.keyAt(i);

        for(int i = 0; i < mModifierNames.size(); ++i) {

            final int supportedModifier = mModifierNames.keyAt(i);

            if ((modifiers & supportedModifier) != 0) {

                if (MODIFIER_DRAWABLES.get(supportedModifier) != null) {

                if (mModifierDrawables.get(supportedModifier) != null) {

                    shortcutKeys.add(new StringOrDrawable(

                            MODIFIER_DRAWABLES.get(supportedModifier)));

                            mModifierDrawables.get(supportedModifier)));

                } else {

                    shortcutKeys.add(new StringOrDrawable(

                            MODIFIER_NAMES.get(supportedModifier).toUpperCase()));

                            mModifierNames.get(supportedModifier).toUpperCase()));

                }

                modifiers &= ~supportedModifier;

            }