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

Commit 7572e694 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android Git Automerger
Browse files

am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle... 

am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit 'e3be3cc7':
  Let the ActionBar handle keyboard shortcuts.
parents f256091e e3be3cc7

core/java/android/app/ActionBar.java

+5 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,11 @@ public abstract class ActionBar { 
        return false;

    }



    /** @hide */

    public boolean onKeyShortcut(int keyCode, KeyEvent event) {

        return false;

    }



    /** @hide */

    public boolean collapseActionView() {

        return false;

core/java/android/app/Activity.java

+3 −1
Original line number Diff line number Diff line
@@ -2469,7 +2469,9 @@ public class Activity extends ContextThemeWrapper 
     * @return True if the key shortcut was handled.

     */

    public boolean onKeyShortcut(int keyCode, KeyEvent event) {

        return false;

        // Let the Action Bar have a chance at handling the shortcut.

        ActionBar actionBar = getActionBar();

        return (actionBar != null && actionBar.onKeyShortcut(keyCode, event));

    }



    /**

core/java/com/android/internal/app/ToolbarActionBar.java

+12 −0
Original line number Diff line number Diff line
@@ -463,6 +463,18 @@ public class ToolbarActionBar extends ActionBar { 
        return true;

    }



    @Override

    public boolean onKeyShortcut(int keyCode, KeyEvent event) {

        Menu menu = mDecorToolbar.getMenu();

        if (menu != null) {

            menu.performShortcut(keyCode, event, 0);

        }

        // This action bar always returns true for handling keyboard shortcuts.

        // This will block the window from preparing a temporary panel to handle

        // keyboard shortcuts.

        return true;

    }



    public void addOnMenuVisibilityListener(OnMenuVisibilityListener listener) {

        mMenuVisibilityListeners.add(listener);

    }