Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp

Browse Source 
Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
This commit is contained in:
Michael Wright
2013-04-29 22:50:43 -07:00
parent fd0b0072db b3f6687756
commit 09ab7ef9f7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmds/input/src/com/android/commands/input/Input.java
View File

@@ -56,12 +56,14 @@ public class Input {
return; return;
} }
} else if (command.equals("keyevent")) { } else if (command.equals("keyevent")) {
if (args.length == 2) { if (args.length >= 2) {
int keyCode = KeyEvent.keyCodeFromString(args[1]); for (int i=1; i < args.length; i++) {
if (keyCode == KeyEvent.KEYCODE_UNKNOWN) { int keyCode = KeyEvent.keyCodeFromString(args[i]);
keyCode = KeyEvent.keyCodeFromString("KEYCODE_" + args[1]); if (keyCode == KeyEvent.KEYCODE_UNKNOWN) {
keyCode = KeyEvent.keyCodeFromString("KEYCODE_" + args[i]);
}
sendKeyEvent(keyCode);
} }
sendKeyEvent(keyCode);
return; return;
} }
} else if (command.equals("tap")) { } 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_META_STATE, DEFAULT_PRECISION_X, DEFAULT_PRECISION_Y, DEFAULT_DEVICE_ID,
DEFAULT_EDGE_FLAGS); DEFAULT_EDGE_FLAGS);
event.setSource(inputSource); event.setSource(inputSource);
Log.i("Input", "injectMotionEvent: " + event); Log.i(TAG, "injectMotionEvent: " + event);
InputManager.getInstance().injectInputEvent(event, InputManager.getInstance().injectInputEvent(event,
InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH); InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);
} }
@@ -249,7 +251,7 @@ public class Input {
private void showUsage() { private void showUsage() {
System.err.println("usage: input ..."); System.err.println("usage: input ...");
System.err.println(" input text <string>"); 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] tap <x> <y>");
System.err.println(" input [touchscreen|touchpad|touchnavigation] swipe " System.err.println(" input [touchscreen|touchpad|touchnavigation] swipe "
+ "<x1> <y1> <x2> <y2> [duration(ms)]"); + "<x1> <y1> <x2> <y2> [duration(ms)]");