Skip to content

Display and control your Android device

Move injection methods to Device

Romain Vimont4bbabfb4ef5f
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index 4442188c..ab7b6c40 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -1,10 +1,7 @@
package com.genymobile.scrcpy;
-import com.genymobile.scrcpy.wrappers.InputManager;
-
import android.os.SystemClock;
import android.view.InputDevice;
-import android.view.InputEvent;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.MotionEvent;
@@ -50,7 +47,7 @@ public class Controller {
public void control() throws IOException {
// on start, power on the device
if (!device.isScreenOn()) {
- injectKeycode(KeyEvent.KEYCODE_POWER);
+ device.injectKeycode(KeyEvent.KEYCODE_POWER);
// dirty hack
// After POWER is injected, the device is powered on asynchronously.
@@ -133,7 +130,7 @@ public class Controller {
}
private boolean injectKeycode(int action, int keycode, int metaState) {
- return injectKeyEvent(action, keycode, 0, metaState);
+ return device.injectKeyEvent(action, keycode, 0, metaState);
}
private boolean injectChar(char c) {
@@ -144,7 +141,7 @@ public class Controller {
return false;
}
for (KeyEvent event : events) {
- if (!injectEvent(event)) {
+ if (!device.injectEvent(event)) {
return false;
}
}
@@ -200,7 +197,7 @@ public class Controller {
MotionEvent event = MotionEvent
.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
InputDevice.SOURCE_TOUCHSCREEN, 0);
- return injectEvent(event);
+ return device.injectEvent(event);
}
private boolean injectScroll(Position position, int hScroll, int vScroll) {
@@ -223,26 +220,11 @@ public class Controller {
MotionEvent event = MotionEvent
.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
InputDevice.SOURCE_TOUCHSCREEN, 0);
- return injectEvent(event);
- }
-
- private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
- long now = SystemClock.uptimeMillis();
- KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
- InputDevice.SOURCE_KEYBOARD);
- return injectEvent(event);
- }
-
- private boolean injectKeycode(int keyCode) {
- return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
- }
-
- private boolean injectEvent(InputEvent event) {
- return device.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
+ return device.injectEvent(event);
}
private boolean pressBackOrTurnScreenOn() {
int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
- return injectKeycode(keycode);
+ return device.injectKeycode(keycode);
}
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
index ec28bd7c..349486c3 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -10,8 +10,12 @@ import android.content.IOnPrimaryClipChangedListener;
import android.graphics.Rect;
import android.os.Build;
import android.os.IBinder;
+import android.os.SystemClock;
import android.view.IRotationWatcher;
+import android.view.InputDevice;
import android.view.InputEvent;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -147,7 +151,7 @@ public final class Device {
return supportsInputEvents;
}
- public boolean injectInputEvent(InputEvent inputEvent, int mode) {
+ public boolean injectEvent(InputEvent inputEvent, int mode) {
if (!supportsInputEvents()) {
throw new AssertionError("Could not inject input event if !supportsInputEvents()");
}
@@ -159,6 +163,21 @@ public final class Device {
return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
}
+ public boolean injectEvent(InputEvent event) {
+ return injectEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
+ }
+
+ public boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
+ long now = SystemClock.uptimeMillis();
+ KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
+ InputDevice.SOURCE_KEYBOARD);
+ return injectEvent(event);
+ }
+
+ public boolean injectKeycode(int keyCode) {
+ return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
+ }
+
public boolean isScreenOn() {
return serviceManager.getPowerManager().isScreenOn();
}