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

Commit e631e32a authored by Peeyush Agarwal's avatar Peeyush Agarwal
Browse files

Extend MenuItem to allow modifier keys for shortcut 

Before this, CTRL was the default modifier for MenuItem shortcuts.
Now, It's possible to specify the modifier in XML or via MenuItem
methods.
The modifier list includes META, CTRL, ALT, SHIFT, SYM and FUNCTION.

WIP on support library implementation

Bug: 32165848
Test: Run the tests using following commands:
> cts-tradefed run cts-dev -m CtsViewTestCases -t
>   android.view.cts.MenuTest#testPerformShortcut
> cts-tradefed run cts-dev -m CtsViewTestCases -t
>   android.view.cts.MenuInflaterTest#testInflateShortcutModifiersFromXml

Change-Id: I7db4607d4657451934761914efe4c250de109653
parent 155c3a88

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ package android { 
    field public static final int allowTaskReparenting = 16843268; // 0x1010204

    field public static final int allowUndo = 16843999; // 0x10104df

    field public static final int alpha = 16843551; // 0x101031f

    field public static final int alphabeticModifiers = 16844112; // 0x1010550

    field public static final int alphabeticShortcut = 16843235; // 0x10101e3

    field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef

    field public static final int alwaysRetainTaskState = 16843267; // 0x1010203
@@ -922,6 +923,7 @@ package android { 
    field public static final int numbersSelectorColor = 16843939; // 0x10104a3

    field public static final int numbersTextColor = 16843937; // 0x10104a1

    field public static final deprecated int numeric = 16843109; // 0x1010165

    field public static final int numericModifiers = 16844113; // 0x1010551

    field public static final int numericShortcut = 16843236; // 0x10101e4

    field public static final int offset = 16844052; // 0x1010514

    field public static final int onClick = 16843375; // 0x101026f
@@ -43832,6 +43834,7 @@ package android.view { 
    field public static final int FLAG_APPEND_TO_GROUP = 1; // 0x1

    field public static final int FLAG_PERFORM_NO_CLOSE = 1; // 0x1

    field public static final int NONE = 0; // 0x0

    field public static final int SUPPORTED_MODIFIERS_MASK = 69647; // 0x1100f

  }















  public class MenuInflater {









@@ -43844,6 +43847,7 @@ package android.view {













    method public abstract boolean expandActionView();















    method public abstract android.view.ActionProvider getActionProvider();















    method public abstract android.view.View getActionView();













    method public default int getAlphabeticModifiers();















    method public abstract char getAlphabeticShortcut();















    method public default java.lang.CharSequence getContentDescription();















    method public abstract int getGroupId();









@@ -43851,6 +43855,7 @@ package android.view {













    method public abstract android.content.Intent getIntent();















    method public abstract int getItemId();















    method public abstract android.view.ContextMenu.ContextMenuInfo getMenuInfo();













    method public default int getNumericModifiers();















    method public abstract char getNumericShortcut();















    method public abstract int getOrder();















    method public abstract android.view.SubMenu getSubMenu();









@@ -43867,6 +43872,7 @@ package android.view {













    method public abstract android.view.MenuItem setActionView(android.view.View);















    method public abstract android.view.MenuItem setActionView(int);















    method public abstract android.view.MenuItem setAlphabeticShortcut(char);













    method public default android.view.MenuItem setAlphabeticShortcut(char, int);















    method public abstract android.view.MenuItem setCheckable(boolean);















    method public abstract android.view.MenuItem setChecked(boolean);















    method public default android.view.MenuItem setContentDescription(java.lang.CharSequence);









@@ -43875,9 +43881,11 @@ package android.view {













    method public abstract android.view.MenuItem setIcon(int);















    method public abstract android.view.MenuItem setIntent(android.content.Intent);















    method public abstract android.view.MenuItem setNumericShortcut(char);













    method public default android.view.MenuItem setNumericShortcut(char, int);















    method public abstract android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);















    method public abstract android.view.MenuItem setOnMenuItemClickListener(android.view.MenuItem.OnMenuItemClickListener);















    method public abstract android.view.MenuItem setShortcut(char, char);













    method public default android.view.MenuItem setShortcut(char, char, int, int);















    method public abstract void setShowAsAction(int);















    method public abstract android.view.MenuItem setShowAsActionFlags(int);















    method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);

























api/system-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -380,6 +380,7 @@ package android {













    field public static final int allowTaskReparenting = 16843268; // 0x1010204















    field public static final int allowUndo = 16843999; // 0x10104df















    field public static final int alpha = 16843551; // 0x101031f













    field public static final int alphabeticModifiers = 16844112; // 0x1010550















    field public static final int alphabeticShortcut = 16843235; // 0x10101e3















    field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef















    field public static final int alwaysRetainTaskState = 16843267; // 0x1010203










@@ -1034,6 +1035,7 @@ package android {













    field public static final int numbersSelectorColor = 16843939; // 0x10104a3















    field public static final int numbersTextColor = 16843937; // 0x10104a1















    field public static final deprecated int numeric = 16843109; // 0x1010165













    field public static final int numericModifiers = 16844113; // 0x1010551















    field public static final int numericShortcut = 16843236; // 0x10101e4















    field public static final int offset = 16844052; // 0x1010514















    field public static final int onClick = 16843375; // 0x101026f










@@ -47239,6 +47241,7 @@ package android.view {













    field public static final int FLAG_APPEND_TO_GROUP = 1; // 0x1















    field public static final int FLAG_PERFORM_NO_CLOSE = 1; // 0x1















    field public static final int NONE = 0; // 0x0













    field public static final int SUPPORTED_MODIFIERS_MASK = 69647; // 0x1100f















  }





























  public class MenuInflater {









@@ -47251,6 +47254,7 @@ package android.view {













    method public abstract boolean expandActionView();















    method public abstract android.view.ActionProvider getActionProvider();















    method public abstract android.view.View getActionView();













    method public default int getAlphabeticModifiers();















    method public abstract char getAlphabeticShortcut();















    method public default java.lang.CharSequence getContentDescription();















    method public abstract int getGroupId();









@@ -47258,6 +47262,7 @@ package android.view {













    method public abstract android.content.Intent getIntent();















    method public abstract int getItemId();















    method public abstract android.view.ContextMenu.ContextMenuInfo getMenuInfo();













    method public default int getNumericModifiers();















    method public abstract char getNumericShortcut();















    method public abstract int getOrder();















    method public abstract android.view.SubMenu getSubMenu();









@@ -47274,6 +47279,7 @@ package android.view {













    method public abstract android.view.MenuItem setActionView(android.view.View);















    method public abstract android.view.MenuItem setActionView(int);















    method public abstract android.view.MenuItem setAlphabeticShortcut(char);













    method public default android.view.MenuItem setAlphabeticShortcut(char, int);















    method public abstract android.view.MenuItem setCheckable(boolean);















    method public abstract android.view.MenuItem setChecked(boolean);















    method public default android.view.MenuItem setContentDescription(java.lang.CharSequence);









@@ -47282,9 +47288,11 @@ package android.view {













    method public abstract android.view.MenuItem setIcon(int);















    method public abstract android.view.MenuItem setIntent(android.content.Intent);















    method public abstract android.view.MenuItem setNumericShortcut(char);













    method public default android.view.MenuItem setNumericShortcut(char, int);















    method public abstract android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);















    method public abstract android.view.MenuItem setOnMenuItemClickListener(android.view.MenuItem.OnMenuItemClickListener);















    method public abstract android.view.MenuItem setShortcut(char, char);













    method public default android.view.MenuItem setShortcut(char, char, int, int);















    method public abstract void setShowAsAction(int);















    method public abstract android.view.MenuItem setShowAsActionFlags(int);















    method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);

























api/test-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -268,6 +268,7 @@ package android {













    field public static final int allowTaskReparenting = 16843268; // 0x1010204















    field public static final int allowUndo = 16843999; // 0x10104df















    field public static final int alpha = 16843551; // 0x101031f













    field public static final int alphabeticModifiers = 16844112; // 0x1010550















    field public static final int alphabeticShortcut = 16843235; // 0x10101e3















    field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef















    field public static final int alwaysRetainTaskState = 16843267; // 0x1010203










@@ -922,6 +923,7 @@ package android {













    field public static final int numbersSelectorColor = 16843939; // 0x10104a3















    field public static final int numbersTextColor = 16843937; // 0x10104a1















    field public static final deprecated int numeric = 16843109; // 0x1010165













    field public static final int numericModifiers = 16844113; // 0x1010551















    field public static final int numericShortcut = 16843236; // 0x10101e4















    field public static final int offset = 16844052; // 0x1010514















    field public static final int onClick = 16843375; // 0x101026f










@@ -44136,6 +44138,7 @@ package android.view {













    field public static final int FLAG_APPEND_TO_GROUP = 1; // 0x1















    field public static final int FLAG_PERFORM_NO_CLOSE = 1; // 0x1















    field public static final int NONE = 0; // 0x0













    field public static final int SUPPORTED_MODIFIERS_MASK = 69647; // 0x1100f















  }





























  public class MenuInflater {









@@ -44148,6 +44151,7 @@ package android.view {













    method public abstract boolean expandActionView();















    method public abstract android.view.ActionProvider getActionProvider();















    method public abstract android.view.View getActionView();













    method public default int getAlphabeticModifiers();















    method public abstract char getAlphabeticShortcut();















    method public default java.lang.CharSequence getContentDescription();















    method public abstract int getGroupId();









@@ -44155,6 +44159,7 @@ package android.view {













    method public abstract android.content.Intent getIntent();















    method public abstract int getItemId();















    method public abstract android.view.ContextMenu.ContextMenuInfo getMenuInfo();













    method public default int getNumericModifiers();















    method public abstract char getNumericShortcut();















    method public abstract int getOrder();















    method public abstract android.view.SubMenu getSubMenu();









@@ -44171,6 +44176,7 @@ package android.view {













    method public abstract android.view.MenuItem setActionView(android.view.View);















    method public abstract android.view.MenuItem setActionView(int);















    method public abstract android.view.MenuItem setAlphabeticShortcut(char);













    method public default android.view.MenuItem setAlphabeticShortcut(char, int);















    method public abstract android.view.MenuItem setCheckable(boolean);















    method public abstract android.view.MenuItem setChecked(boolean);















    method public default android.view.MenuItem setContentDescription(java.lang.CharSequence);









@@ -44179,9 +44185,11 @@ package android.view {













    method public abstract android.view.MenuItem setIcon(int);















    method public abstract android.view.MenuItem setIntent(android.content.Intent);















    method public abstract android.view.MenuItem setNumericShortcut(char);













    method public default android.view.MenuItem setNumericShortcut(char, int);















    method public abstract android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);















    method public abstract android.view.MenuItem setOnMenuItemClickListener(android.view.MenuItem.OnMenuItemClickListener);















    method public abstract android.view.MenuItem setShortcut(char, char);













    method public default android.view.MenuItem setShortcut(char, char, int, int);















    method public abstract void setShowAsAction(int);















    method public abstract android.view.MenuItem setShowAsActionFlags(int);















    method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);

























core/java/android/app/Activity.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -1744,13 +1744,14 @@ public class Activity extends ContextThemeWrapper













            final MenuItem item = menu.getItem(i);















            final CharSequence title = item.getTitle();















            final char alphaShortcut = item.getAlphabeticShortcut();













            final int alphaModifiers = item.getAlphabeticModifiers();















            if (title != null && alphaShortcut != MIN_VALUE) {















                if (group == null) {















                    final int resource = mApplication.getApplicationInfo().labelRes;















                    group = new KeyboardShortcutGroup(resource != 0 ? getString(resource) : null);















                }















                group.addItem(new KeyboardShortcutInfo(













                    title, alphaShortcut, KeyEvent.META_CTRL_ON));













                    title, alphaShortcut, alphaModifiers));















            }















        }















        if (group != null) {

































core/java/android/view/Menu.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -74,6 +74,13 @@ public interface Menu {













     */















    static final int CATEGORY_SHIFT = 16;





























    /**













     * A mask of all supported modifiers for MenuItem's keyboard shortcuts













     */













    static final int SUPPORTED_MODIFIERS_MASK = KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON













            | KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON | KeyEvent.META_SYM_ON













            | KeyEvent.META_FUNCTION_ON;





























    /**















     * Value to use for group and item identifier integers when you don't care















     * about them.