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

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

Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev

parents e014b9ef fcd7e80b

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -34577,7 +34577,7 @@ package android.service.dreams { 
    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);

    method public boolean onSearchRequested(android.view.SearchEvent);

    method public boolean onSearchRequested();

    method public void onWakeUp();
@@ -43664,7 +43664,7 @@ package android.view { 
    method public abstract boolean onMenuOpened(int, android.view.Menu);

    method public abstract void onPanelClosed(int, android.view.Menu);

    method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public default void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public default void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);

    method public abstract boolean onSearchRequested();

    method public abstract boolean onSearchRequested(android.view.SearchEvent);

    method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -37027,7 +37027,7 @@ package android.service.dreams { 
    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);

    method public boolean onSearchRequested(android.view.SearchEvent);

    method public boolean onSearchRequested();

    method public void onWakeUp();
@@ -46391,7 +46391,7 @@ package android.view { 
    method public abstract boolean onMenuOpened(int, android.view.Menu);

    method public abstract void onPanelClosed(int, android.view.Menu);

    method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public default void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public default void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);

    method public abstract boolean onSearchRequested();

    method public abstract boolean onSearchRequested(android.view.SearchEvent);

    method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -34648,7 +34648,7 @@ package android.service.dreams { 
    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);

    method public boolean onSearchRequested(android.view.SearchEvent);

    method public boolean onSearchRequested();

    method public void onWakeUp();
@@ -43737,7 +43737,7 @@ package android.view { 
    method public abstract boolean onMenuOpened(int, android.view.Menu);

    method public abstract void onPanelClosed(int, android.view.Menu);

    method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public default void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public default void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);

    method public abstract boolean onSearchRequested();

    method public abstract boolean onSearchRequested(android.view.SearchEvent);

    method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

core/java/android/app/Activity.java

+10 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.InsetDrawable;

import android.graphics.drawable.LayerDrawable;

import android.graphics.drawable.ShapeDrawable;

import android.hardware.input.InputManager;

import android.media.AudioManager;

import android.media.session.MediaController;

import android.net.Uri;
@@ -91,6 +92,8 @@ import android.view.ContextMenu.ContextMenuInfo; 
import android.view.ContextThemeWrapper;

import android.view.DragEvent;

import android.view.DropPermissions;

import android.view.InputDevice;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutInfo;
@@ -1679,10 +1682,16 @@ public class Activity extends ContextThemeWrapper 
    }



    @Override

    public void onProvideKeyboardShortcuts(List<KeyboardShortcutGroup> data, Menu menu) {

    public void onProvideKeyboardShortcuts(

            List<KeyboardShortcutGroup> data, Menu menu, int deviceId) {

        if (menu == null) {

          return;

        }

        final InputDevice inputDevice = InputManager.getInstance().getInputDevice(deviceId);

        if (inputDevice == null) {

            return;

        }

        final KeyCharacterMap keyCharacterMap = inputDevice.getKeyCharacterMap();

        KeyboardShortcutGroup group = null;

        int menuSize = menu.size();

        for (int i = 0; i < menuSize; ++i) {

core/java/android/app/Dialog.java

+0 −7
Original line number Diff line number Diff line
@@ -1081,13 +1081,6 @@ public class Dialog implements DialogInterface, Window.Callback, 
        }

    }



    /**

     * {@inheritDoc}

     */

    @Override

    public void onProvideKeyboardShortcuts(List<KeyboardShortcutGroup> data, Menu menu) {

    }



    /**

     * @return The activity associated with this dialog, or null if there is no associated activity.

     */