diff options
| author | Clara Bayarri <clarabayarri@google.com> | 2016-03-24 13:30:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-24 13:30:48 +0000 |
| commit | 3e5bf786b7ca36fa0cc150fcd8d0e7a69ecb9db0 (patch) | |
| tree | 8eb6eca2c64bc402d6ebfb3b068828014223aa98 /core/java/android/view/Window.java | |
| parent | e014b9ef686436c5d3b6c02f2d936ee0043e55f2 (diff) | |
| parent | fcd7e80b21cc9db6be00e37371401ea1d0938796 (diff) | |
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
Diffstat (limited to 'core/java/android/view/Window.java')
| -rw-r--r-- | core/java/android/view/Window.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 63f37440f832..36ee3e67ef79 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -565,9 +565,10 @@ public abstract class Window { * * @param data The data list to populate with shortcuts. * @param menu The current menu, which may be null. + * @param deviceId The id for the connected device the shortcuts should be provided for. */ default public void onProvideKeyboardShortcuts( - List<KeyboardShortcutGroup> data, @Nullable Menu menu) { }; + List<KeyboardShortcutGroup> data, @Nullable Menu menu, int deviceId) { }; } /** @hide */ |