diff options
| author | 2017-03-08 17:52:37 +0000 | |
|---|---|---|
| committer | 2017-03-08 17:52:40 +0000 | |
| commit | 63976669f56ca3be4604af1d0b052566a15ecd2b (patch) | |
| tree | cc98fc6354e070f1b7a5ab542b6d2a25d4dbc15a | |
| parent | 40034ccac189c8b629c0727c6c8c200a30ba2701 (diff) | |
| parent | 2ef1d0cfca010b398fef5b6ee242c110a823bb95 (diff) | |
Merge "Store alphaChar as lower case in MenuItem's implementations"
| -rw-r--r-- | core/java/com/android/internal/view/menu/ActionMenuItem.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuItemImpl.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/com/android/internal/view/menu/ActionMenuItem.java b/core/java/com/android/internal/view/menu/ActionMenuItem.java index ace0cce10473..ac226ddb8ea9 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItem.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItem.java @@ -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; } diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index 4c3118d4f072..9310d14ab667 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -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); |