moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use back as start on Android TV

Browse Source
This commit is contained in:
Cameron Gutman 2014-11-22 19:33:26 -08:00
parent 72c1696f43
commit df67795c4a
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
View File

@ -7,6 +7,7 @@ import android.view.InputDevice;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import com.limelight.LimeLog;
import com.limelight.nvstream.NvConnection; import com.limelight.nvstream.NvConnection;
import com.limelight.nvstream.input.ControllerPacket; import com.limelight.nvstream.input.ControllerPacket;
import com.limelight.utils.Vector2d; import com.limelight.utils.Vector2d;
@ -87,8 +88,11 @@ public class ControllerHandler {
private ControllerMapping createMappingForDevice(InputDevice dev) { private ControllerMapping createMappingForDevice(InputDevice dev) {
ControllerMapping mapping = new ControllerMapping(); ControllerMapping mapping = new ControllerMapping();
String devName = dev.getName();
mapping.leftStickXAxis = MotionEvent.AXIS_X;
LimeLog.info("Creating controller mapping for device: "+devName);
mapping.leftStickXAxis = MotionEvent.AXIS_X;
mapping.leftStickYAxis = MotionEvent.AXIS_Y; mapping.leftStickYAxis = MotionEvent.AXIS_Y;
InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER); InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER);
@ -111,8 +115,7 @@ public class ControllerHandler {
{ {
InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX); InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY); InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
if (rxRange != null && ryRange != null) { if (rxRange != null && ryRange != null && devName != null) {
String devName = dev.getName();
if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) { if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
// Xbox controllers use RX and RY for right stick // Xbox controllers use RX and RY for right stick
mapping.rightStickXAxis = MotionEvent.AXIS_RX; mapping.rightStickXAxis = MotionEvent.AXIS_RX;
@ -187,23 +190,19 @@ public class ControllerHandler {
} }
} }
/* // For the Nexus Player (and probably other ATV devices), we should
FIXME: This is broken on SHIELD // use the back button as start since it doesn't have a start/menu button
// on the controller
// This path will make the back button function as start for Android TV controllers if (devName != null && devName.contains("ASUS Gamepad")) {
// that don't have a real start button. It's fine being KitKat and above because // We can only do this check on KitKat or higher, but it doesn't matter since ATV
// ATV is a 5.0 platform // is Android 5.0 anyway
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
// Make sure this is a gamepad and not some other device
if ((dev.getSources() & InputDevice.SOURCE_GAMEPAD) != 0) {
// Check if this controller has a start or menu button
boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0); boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
if (!hasStartKey[0] && !hasStartKey[1]) { if (!hasStartKey[0] && !hasStartKey[1]) {
mapping.backIsStart = true; mapping.backIsStart = true;
} }
} }
} }
*/
return mapping; return mapping;
} }