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

Commit 4256741d authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "State a fixed order for modifiers in the Shorcuts Helper"

parents 604582b6 7ff3798f

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

+8 −2
Original line number Original line Diff line number Diff line
@@ -85,6 +85,12 @@ public final class KeyboardShortcuts { 
    private final SparseArray<String> mModifierNames = new SparseArray<>();

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

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

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

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

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

    // Ordered list of modifiers that are supported. All values in this array must exist in

    // mModifierNames.

    private final int[] mModifierList = new int[] {

            KeyEvent.META_META_ON, KeyEvent.META_CTRL_ON, KeyEvent.META_ALT_ON,

            KeyEvent.META_SHIFT_ON, KeyEvent.META_SYM_ON, KeyEvent.META_FUNCTION_ON

    };





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

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

    private final Context mContext;

    private final Context mContext;
@@ -724,8 +730,8 @@ public final class KeyboardShortcuts { 
        if (modifiers == 0) {

        if (modifiers == 0) {

            return shortcutKeys;

            return shortcutKeys;

        }

        }

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

        for(int i = 0; i < mModifierList.length; ++i) {

            final int supportedModifier = mModifierNames.keyAt(i);

            final int supportedModifier = mModifierList[i];

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

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

                shortcutKeys.add(new StringDrawableContainer(

                shortcutKeys.add(new StringDrawableContainer(

                        mModifierNames.get(supportedModifier),

                        mModifierNames.get(supportedModifier),