diff options
| author | Michael Wright <michaelwr@google.com> | 2013-04-29 22:50:43 -0700 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2013-04-29 22:50:43 -0700 |
| commit | 09ab7ef9f76d7e1a614ee8a8be915d06894f8d37 (patch) | |
| tree | 2e2aed0fdeda463536d305955d3a9c918b14e0cc /cmds | |
| parent | fd0b0072db6d89c85a5ea20383a1c3dc289d1d38 (diff) | |
| parent | b3f6687756ffb660f834ef673bed04b2d4a26d21 (diff) | |
| download | frameworks_base-09ab7ef9f76d7e1a614ee8a8be915d06894f8d37.zip frameworks_base-09ab7ef9f76d7e1a614ee8a8be915d06894f8d37.tar.gz frameworks_base-09ab7ef9f76d7e1a614ee8a8be915d06894f8d37.tar.bz2 | |
resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp
Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/input/src/com/android/commands/input/Input.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmds/input/src/com/android/commands/input/Input.java b/cmds/input/src/com/android/commands/input/Input.java index e43501c..80ac539 100644 --- a/cmds/input/src/com/android/commands/input/Input.java +++ b/cmds/input/src/com/android/commands/input/Input.java @@ -56,12 +56,14 @@ public class Input { return; } } else if (command.equals("keyevent")) { - if (args.length == 2) { - int keyCode = KeyEvent.keyCodeFromString(args[1]); - if (keyCode == KeyEvent.KEYCODE_UNKNOWN) { - keyCode = KeyEvent.keyCodeFromString("KEYCODE_" + args[1]); + if (args.length >= 2) { + for (int i=1; i < args.length; i++) { + int keyCode = KeyEvent.keyCodeFromString(args[i]); + if (keyCode == KeyEvent.KEYCODE_UNKNOWN) { + keyCode = KeyEvent.keyCodeFromString("KEYCODE_" + args[i]); + } + sendKeyEvent(keyCode); } - sendKeyEvent(keyCode); return; } } else if (command.equals("tap")) { @@ -237,7 +239,7 @@ public class Input { DEFAULT_META_STATE, DEFAULT_PRECISION_X, DEFAULT_PRECISION_Y, DEFAULT_DEVICE_ID, DEFAULT_EDGE_FLAGS); event.setSource(inputSource); - Log.i("Input", "injectMotionEvent: " + event); + Log.i(TAG, "injectMotionEvent: " + event); InputManager.getInstance().injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH); } @@ -249,7 +251,7 @@ public class Input { private void showUsage() { System.err.println("usage: input ..."); System.err.println(" input text <string>"); - System.err.println(" input keyevent <key code number or name>"); + System.err.println(" input keyevent <key code number or name> ..."); System.err.println(" input [touchscreen|touchpad|touchnavigation] tap <x> <y>"); System.err.println(" input [touchscreen|touchpad|touchnavigation] swipe " + "<x1> <y1> <x2> <y2> [duration(ms)]"); |