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

Commit 63976669 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Store alphaChar as lower case in MenuItem's implementations"

parents 40034cca 2ef1d0cf

core/java/com/android/internal/view/menu/ActionMenuItem.java

+4 −4
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ public class ActionMenuItem implements MenuItem { 
    }



    public MenuItem setAlphabeticShortcut(char alphaChar) {

        mShortcutAlphabeticChar = alphaChar;

        mShortcutAlphabeticChar = Character.toLowerCase(alphaChar);

        return this;

    }



    public MenuItem setAlphabeticShortcut(char alphachar, int alphaModifiers) {

        mShortcutAlphabeticChar = alphachar;

        mShortcutAlphabeticChar = Character.toLowerCase(alphachar);

        mShortcutAlphabeticModifiers = KeyEvent.normalizeMetaState(alphaModifiers);

        return this;

    }
@@ -210,7 +210,7 @@ public class ActionMenuItem implements MenuItem { 


    public MenuItem setShortcut(char numericChar, char alphaChar) {

        mShortcutNumericChar = numericChar;

        mShortcutAlphabeticChar = alphaChar;

        mShortcutAlphabeticChar = Character.toLowerCase(alphaChar);

        return this;

    }
@@ -218,7 +218,7 @@ public class ActionMenuItem implements MenuItem { 
            int alphaModifiers) {

        mShortcutNumericChar = numericChar;

        mShortcutNumericModifiers = KeyEvent.normalizeMetaState(numericModifiers);

        mShortcutAlphabeticChar = alphaChar;

        mShortcutAlphabeticChar = Character.toLowerCase(alphaChar);

        mShortcutAlphabeticModifiers = KeyEvent.normalizeMetaState(alphaModifiers);

        return this;

    }

core/java/com/android/internal/view/menu/MenuItemImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ public final class MenuItemImpl implements MenuItem { 
            return this;

        }



        mShortcutAlphabeticChar = alphaChar;

        mShortcutAlphabeticChar = Character.toLowerCase(alphaChar);

        mShortcutAlphabeticModifiers = KeyEvent.normalizeMetaState(alphaModifiers);



        mMenu.onItemsChanged(false);
@@ -307,7 +307,7 @@ public final class MenuItemImpl implements MenuItem { 
            int alphaModifiers) {

        mShortcutNumericChar = numericChar;

        mShortcutNumericModifiers = KeyEvent.normalizeMetaState(numericModifiers);

        mShortcutAlphabeticChar = alphaChar;

        mShortcutAlphabeticChar = Character.toLowerCase(alphaChar);

        mShortcutAlphabeticModifiers = KeyEvent.normalizeMetaState(alphaModifiers);



        mMenu.onItemsChanged(false);