Bump version to 4.5

This reverts commit 5d84f8af43.

app/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 23
 
-        versionName "4.0.4"
-        versionCode = 82
+        versionName "4.5"
+        versionCode = 84
     }
 
     productFlavors {

app/src/main/java/com/limelight/Game.java

@@ -666,6 +666,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             // This case is for touch-based input devices
             else
             {
+                if (virtualController != null &&
+                        virtualController.getControllerMode() == VirtualController.ControllerMode.Configuration) {
+                    // Ignore presses when the virtual controller is in configuration mode
+                    return true;
+                }
+
                 int actionIndex = event.getActionIndex();
 
                 int eventX = (int)event.getX(actionIndex);

app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java

@@ -129,6 +129,12 @@ public class XboxOneController {
                         // Read the next input state packet
                         long lastMillis = MediaCodecHelper.getMonotonicMillis();
                         res = connection.bulkTransfer(inEndpt, buffer, buffer.length, 3000);
+
+                        // If we get a zero length response, treat it as an error
+                        if (res == 0) {
+                            res = -1;
+                        }
+
                         if (res == -1 && MediaCodecHelper.getMonotonicMillis() - lastMillis < 1000) {
                             LimeLog.warning("Detected device I/O error");
                             XboxOneController.this.stop();

app/src/main/java/com/limelight/binding/input/virtual_controller/AnalogStick.java

@@ -33,7 +33,12 @@ public class AnalogStick extends VirtualControllerElement {
     /**
      * time frame for a double click
      */
-    public final static long timeoutDoubleClick = 250;
+    public final static long timeoutDoubleClick = 350;
+
+    /**
+     * touch down time until the deadzone is lifted to allow precise movements with the analog sticks
+     */
+    public final static long timeoutDeadzone = 150;
 
     /**
      * Listener interface to update registered observers.
@@ -125,14 +130,6 @@ public class AnalogStick extends VirtualControllerElement {
     private long timeLastClick = 0;
 
     private static double getMovementRadius(float x, float y) {
-        // corner cases
-        if (x == 0) {
-            return y > 0 ? y : -y;
-        }
-        if (y == 0) {
-            return x > 0 ? x : -x;
-        }
-        // return hypotenuse (pythagoras)
         return Math.sqrt(x * x + y * y);
     }
 
@@ -210,11 +207,6 @@ public class AnalogStick extends VirtualControllerElement {
         }
     }
 
-    public void setColors(int normalColor, int pressedColor) {
-        this.normalColor = normalColor;
-        this.pressedColor = pressedColor;
-    }
-
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         // calculate new radius sizes depending
@@ -231,33 +223,28 @@ public class AnalogStick extends VirtualControllerElement {
         canvas.drawColor(Color.TRANSPARENT);
 
         paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(getPercent(getCorrectWidth() / 2, 2));
+        paint.setStrokeWidth(getDefaultStrokeWidth());
 
         // draw outer circle
         if (!isPressed() || click_state == CLICK_STATE.SINGLE) {
-            paint.setColor(normalColor);
+            paint.setColor(getDefaultColor());
         } else {
             paint.setColor(pressedColor);
         }
         canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_complete, paint);
 
-        paint.setColor(normalColor);
+        paint.setColor(getDefaultColor());
         // draw dead zone
         canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_dead_zone, paint);
 
         // draw stick depending on state
         switch (stick_state) {
             case NO_MOVEMENT: {
-                paint.setColor(normalColor);
+                paint.setColor(getDefaultColor());
                 canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_analog_stick, paint);
                 break;
             }
-            case MOVED_IN_DEAD_ZONE: {
-                paint.setColor(normalColor);
-                canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint);
-
-                break;
-            }
+            case MOVED_IN_DEAD_ZONE:
             case MOVED_ACTIVE: {
                 paint.setColor(pressedColor);
                 canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint);
@@ -268,7 +255,7 @@ public class AnalogStick extends VirtualControllerElement {
 
     private void updatePosition() {
         // get 100% way
-        float complete = (radius_complete - radius_analog_stick - radius_dead_zone);
+        float complete = radius_complete - radius_analog_stick;
 
         // calculate relative way
         float correlated_y = (float) (Math.sin(Math.PI / 2 - movement_angle) * (movement_radius));
@@ -278,15 +265,18 @@ public class AnalogStick extends VirtualControllerElement {
         position_stick_x = getWidth() / 2 - correlated_x;
         position_stick_y = getHeight() / 2 - correlated_y;
 
-        // set active depending on dead zone
-        stick_state = movement_radius > radius_dead_zone ?
+        // Stay active even if we're back in the deadzone because we know the user is actively
+        // giving analog stick input and we don't want to snap back into the deadzone.
+        // We also release the deadzone if the user keeps the stick pressed for a bit to allow
+        // them to make precise movements.
+        stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE ||
+                System.currentTimeMillis() - timeLastClick > timeoutDeadzone ||
+                movement_radius > radius_dead_zone) ?
                 STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;
 
         //  trigger move event if state active
         if (stick_state == STICK_STATE.MOVED_ACTIVE) {
-            notifyOnMovement(-(1 / complete) *
-                    (correlated_x - (correlated_x > 0 ? radius_dead_zone : -radius_dead_zone)), (1 / complete) *
-                    (correlated_y - (correlated_y > 0 ? radius_dead_zone : -radius_dead_zone)));
+            notifyOnMovement(-correlated_x / complete, correlated_y / complete);
         }
     }
 

app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java

@@ -144,13 +144,14 @@ public class DigitalButton extends VirtualControllerElement {
         // set transparent background
         canvas.drawColor(Color.TRANSPARENT);
 
-        paint.setTextSize(getPercent(getCorrectWidth(), 50));
+        paint.setTextSize(getPercent(getWidth(), 30));
         paint.setTextAlign(Paint.Align.CENTER);
-        paint.setStrokeWidth(3);
+        paint.setStrokeWidth(getDefaultStrokeWidth());
 
-        paint.setColor(isPressed() ? pressedColor : normalColor);
+        paint.setColor(isPressed() ? pressedColor : getDefaultColor());
         paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(1, 1, getWidth() - 1, getHeight() - 1, paint);
+        canvas.drawRect(paint.getStrokeWidth(), paint.getStrokeWidth(),
+                getWidth() - paint.getStrokeWidth(), getHeight() - paint.getStrokeWidth(), paint);
 
         if (icon != -1) {
             Drawable d = getResources().getDrawable(icon);
@@ -158,7 +159,8 @@ public class DigitalButton extends VirtualControllerElement {
             d.draw(canvas);
         } else {
             paint.setStyle(Paint.Style.FILL_AND_STROKE);
-            canvas.drawText(text, getPercent(getWidth(), 50), getPercent(getHeight(), 73), paint);
+            paint.setStrokeWidth(getDefaultStrokeWidth()/2);
+            canvas.drawText(text, getPercent(getWidth(), 50), getPercent(getHeight(), 63), paint);
         }
     }
 

app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalPad.java

@@ -22,6 +22,8 @@ public class DigitalPad extends VirtualControllerElement {
     public final static int DIGITAL_PAD_DIRECTION_DOWN = 8;
     List<DigitalPadListener> listeners = new ArrayList<DigitalPadListener>();
 
+    private static final int DPAD_MARGIN = 5;
+
     private final Paint paint = new Paint();
 
     public DigitalPad(VirtualController controller, Context context) {
@@ -39,12 +41,12 @@ public class DigitalPad extends VirtualControllerElement {
 
         paint.setTextSize(getPercent(getCorrectWidth(), 20));
         paint.setTextAlign(Paint.Align.CENTER);
-        paint.setStrokeWidth(3);
+        paint.setStrokeWidth(getDefaultStrokeWidth());
 
         if (direction == DIGITAL_PAD_DIRECTION_NO_DIRECTION) {
             // draw no direction rect
             paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(normalColor);
+            paint.setColor(getDefaultColor());
             canvas.drawRect(
                     getPercent(getWidth(), 36), getPercent(getHeight(), 36),
                     getPercent(getWidth(), 63), getPercent(getHeight(), 63),
@@ -54,34 +56,55 @@ public class DigitalPad extends VirtualControllerElement {
 
         // draw left rect
         paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0 ? pressedColor : normalColor);
+                (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0 ? pressedColor : getDefaultColor());
         paint.setStyle(Paint.Style.STROKE);
         canvas.drawRect(
-                0, getPercent(getHeight(), 33),
+                paint.getStrokeWidth()+DPAD_MARGIN, getPercent(getHeight(), 33),
                 getPercent(getWidth(), 33), getPercent(getHeight(), 66),
                 paint
         );
 
+
+        // draw up rect
+        paint.setColor(
+                (direction & DIGITAL_PAD_DIRECTION_UP) > 0 ? pressedColor : getDefaultColor());
+        paint.setStyle(Paint.Style.STROKE);
+        canvas.drawRect(
+                getPercent(getWidth(), 33), paint.getStrokeWidth()+DPAD_MARGIN,
+                getPercent(getWidth(), 66), getPercent(getHeight(), 33),
+                paint
+        );
+
+        // draw right rect
+        paint.setColor(
+                (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0 ? pressedColor : getDefaultColor());
+        paint.setStyle(Paint.Style.STROKE);
+        canvas.drawRect(
+                getPercent(getWidth(), 66), getPercent(getHeight(), 33),
+                getWidth() - (paint.getStrokeWidth()+DPAD_MARGIN), getPercent(getHeight(), 66),
+                paint
+        );
+
+        // draw down rect
+        paint.setColor(
+                (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0 ? pressedColor : getDefaultColor());
+        paint.setStyle(Paint.Style.STROKE);
+        canvas.drawRect(
+                getPercent(getWidth(), 33), getPercent(getHeight(), 66),
+                getPercent(getWidth(), 66), getHeight() - (paint.getStrokeWidth()+DPAD_MARGIN),
+                paint
+        );
+
         // draw left up line
         paint.setColor((
                         (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0 &&
                                 (direction & DIGITAL_PAD_DIRECTION_UP) > 0
-                ) ? pressedColor : normalColor
+                ) ? pressedColor : getDefaultColor()
         );
         paint.setStyle(Paint.Style.STROKE);
         canvas.drawLine(
-                0, getPercent(getHeight(), 33),
-                getPercent(getWidth(), 33), 0,
-                paint
-        );
-
-        // draw up rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_UP) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                getPercent(getWidth(), 33), 0,
-                getPercent(getWidth(), 66), getPercent(getHeight(), 33),
+                paint.getStrokeWidth()+DPAD_MARGIN, getPercent(getHeight(), 33),
+                getPercent(getWidth(), 33), paint.getStrokeWidth()+DPAD_MARGIN,
                 paint
         );
 
@@ -89,22 +112,12 @@ public class DigitalPad extends VirtualControllerElement {
         paint.setColor((
                         (direction & DIGITAL_PAD_DIRECTION_UP) > 0 &&
                                 (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0
-                ) ? pressedColor : normalColor
+                ) ? pressedColor : getDefaultColor()
         );
         paint.setStyle(Paint.Style.STROKE);
         canvas.drawLine(
-                getPercent(getWidth(), 66), 0,
-                getPercent(getWidth(), 100), getPercent(getHeight(), 33),
-                paint
-        );
-
-        // draw right rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                getPercent(getWidth(), 66), getPercent(getHeight(), 33),
-                getPercent(getWidth(), 100), getPercent(getHeight(), 66),
+                getPercent(getWidth(), 66), paint.getStrokeWidth()+DPAD_MARGIN,
+                getWidth() - (paint.getStrokeWidth()+DPAD_MARGIN), getPercent(getHeight(), 33),
                 paint
         );
 
@@ -112,22 +125,12 @@ public class DigitalPad extends VirtualControllerElement {
         paint.setColor((
                         (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0 &&
                                 (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0
-                ) ? pressedColor : normalColor
+                ) ? pressedColor : getDefaultColor()
         );
         paint.setStyle(Paint.Style.STROKE);
         canvas.drawLine(
-                getPercent(getWidth(), 100), getPercent(getHeight(), 66),
-                getPercent(getWidth(), 66), getPercent(getHeight(), 100),
-                paint
-        );
-
-        // draw down rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                getPercent(getWidth(), 33), getPercent(getHeight(), 66),
-                getPercent(getWidth(), 66), getPercent(getHeight(), 100),
+                getWidth()-paint.getStrokeWidth(), getPercent(getHeight(), 66),
+                getPercent(getWidth(), 66), getHeight()-(paint.getStrokeWidth()+DPAD_MARGIN),
                 paint
         );
 
@@ -135,12 +138,12 @@ public class DigitalPad extends VirtualControllerElement {
         paint.setColor((
                         (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0 &&
                                 (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0
-                ) ? pressedColor : normalColor
+                ) ? pressedColor : getDefaultColor()
         );
         paint.setStyle(Paint.Style.STROKE);
         canvas.drawLine(
-                getPercent(getWidth(), 33), getPercent(getHeight(), 100),
-                getPercent(getWidth(), 0), getPercent(getHeight(), 66),
+                getPercent(getWidth(), 33), getHeight()-(paint.getStrokeWidth()+DPAD_MARGIN),
+                paint.getStrokeWidth()+DPAD_MARGIN, getPercent(getHeight(), 66),
                 paint
         );
     }

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java

@@ -5,6 +5,7 @@
 package com.limelight.binding.input.virtual_controller;
 
 import android.content.Context;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -33,7 +34,7 @@ public class VirtualController {
         Configuration
     }
 
-    private static final boolean _PRINT_DEBUG_INFORMATION = true;
+    private static final boolean _PRINT_DEBUG_INFORMATION = false;
 
     private NvConnection connection = null;
     private Context context = null;
@@ -63,14 +64,23 @@ public class VirtualController {
         buttonConfigure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                String message;
+
                 if (currentMode == ControllerMode.Configuration) {
                     currentMode = ControllerMode.Active;
+                    message = "Exiting configuration mode";
                 } else {
                     currentMode = ControllerMode.Configuration;
+                    message = "Entering configuration mode";
                 }
-                Toast.makeText(context, "CHANGE MODE " + currentMode, Toast.LENGTH_SHORT).show();
+
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
 
                 relative_layout.invalidate();
+
+                for (VirtualControllerElement element : elements) {
+                    element.invalidate();
+                }
             }
         });
     }
@@ -104,7 +114,10 @@ public class VirtualController {
         relative_layout.removeAllViews();
         removeElements();
 
-        layoutParamsButtonConfigure = new RelativeLayout.LayoutParams(50, 50);
+        DisplayMetrics screen = context.getResources().getDisplayMetrics();
+
+        int buttonSize = (int)(screen.heightPixels*0.05f);
+        layoutParamsButtonConfigure = new RelativeLayout.LayoutParams(buttonSize, buttonSize);
         relative_layout.addView(buttonConfigure, layoutParamsButtonConfigure);
 
         VirtualControllerConfigurationLoader.createDefaultLayout(this, context);

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerConfigurationLoader.java

@@ -138,79 +138,87 @@ public class VirtualControllerConfigurationLoader {
         return new RightAnalogStick(controller, context);
     }
 
+    private static final int BUTTON_BASE_X = 65;
+    private static final int BUTTON_BASE_Y = 5;
+    private static final int BUTTON_WIDTH = getPercent(30, 33);
+    private static final int BUTTON_HEIGHT = getPercent(40, 33);
+
     public static void createDefaultLayout(final VirtualController controller, final Context context) {
 
         DisplayMetrics screen = context.getResources().getDisplayMetrics();
 
+        // NOTE: Some of these getPercent() expressions seem like they can be combined
+        // into a single call. Due to floating point rounding, this isn't actually possible.
+
         controller.addElement(createDigitalPad(controller, context),
                 getPercent(5, screen.widthPixels),
-                getPercent(10, screen.heightPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels),
                 getPercent(30, screen.widthPixels),
                 getPercent(40, screen.heightPixels)
         );
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
-                getPercent(75, screen.widthPixels),
-                getPercent(40, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels)+getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
-                getPercent(85, screen.widthPixels),
-                getPercent(30, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels)+getPercent(BUTTON_HEIGHT, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
-                getPercent(65, screen.widthPixels),
-                getPercent(30, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels)+getPercent(BUTTON_HEIGHT, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
-                getPercent(75, screen.widthPixels),
-                getPercent(20, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels)+getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createLeftTrigger(
-                0, "LT", -1, controller, context),
-                getPercent(65, screen.widthPixels),
-                getPercent(20, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                        0, "LT", -1, controller, context),
+                getPercent(BUTTON_BASE_X, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createRightTrigger(
                 0, "RT", -1, controller, context),
-                getPercent(85, screen.widthPixels),
-                getPercent(20, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
-                getPercent(65, screen.widthPixels),
-                getPercent(40, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
-                getPercent(85, screen.widthPixels),
-                getPercent(40, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
+                getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
+                getPercent(BUTTON_WIDTH, screen.widthPixels),
+                getPercent(BUTTON_HEIGHT, screen.heightPixels)
         );
 
         controller.addElement(createLeftStick(controller, context),
@@ -228,7 +236,7 @@ public class VirtualControllerConfigurationLoader {
         );
 
         controller.addElement(createDigitalButton(
-                ControllerPacket.BACK_FLAG, 0, 2, "SELECT", -1, controller, context),
+                ControllerPacket.BACK_FLAG, 0, 2, "BACK", -1, controller, context),
                 getPercent(40, screen.widthPixels),
                 getPercent(90, screen.heightPixels),
                 getPercent(10, screen.widthPixels),
@@ -237,7 +245,7 @@ public class VirtualControllerConfigurationLoader {
 
         controller.addElement(createDigitalButton(
                 ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context),
-                getPercent(50, screen.widthPixels),
+                getPercent(40, screen.widthPixels)+getPercent(10, screen.widthPixels),
                 getPercent(90, screen.heightPixels),
                 getPercent(10, screen.widthPixels),
                 getPercent(10, screen.heightPixels)

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -20,8 +21,10 @@ public abstract class VirtualControllerElement extends View {
 
     private final Paint paint = new Paint();
 
-    protected int normalColor = 0xF0888888;
+    private int normalColor = 0xF0888888;
     protected int pressedColor = 0xF00000FF;
+    private int configNormalColor = 0xF0FF0000;
+    private int configSelectedColor = 0xF000FF00;
 
     protected int startSize_x;
     protected int startSize_y;
@@ -71,19 +74,18 @@ public abstract class VirtualControllerElement extends View {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        if (virtualController.getControllerMode() == VirtualController.ControllerMode.
-                Configuration) {
-            paint.setColor(pressedColor);
-            paint.setStrokeWidth(3);
+        onElementDraw(canvas);
+
+        if (currentMode != Mode.Normal) {
+            paint.setColor(configSelectedColor);
+            paint.setStrokeWidth(getDefaultStrokeWidth());
             paint.setStyle(Paint.Style.STROKE);
 
-            canvas.drawRect(0, 0,
-                    getWidth(), getHeight(),
+            canvas.drawRect(paint.getStrokeWidth(), paint.getStrokeWidth(),
+                    getWidth()-paint.getStrokeWidth(), getHeight()-paint.getStrokeWidth(),
                     paint);
         }
 
-        onElementDraw(canvas);
-
         super.onDraw(canvas);
     }
 
@@ -132,6 +134,16 @@ public abstract class VirtualControllerElement extends View {
         invalidate();
     }
 
+    protected int getDefaultColor() {
+        return (virtualController.getControllerMode() == VirtualController.ControllerMode.Configuration) ?
+                configNormalColor : normalColor;
+    }
+
+    protected int getDefaultStrokeWidth() {
+        DisplayMetrics screen = getResources().getDisplayMetrics();
+        return (int)(screen.heightPixels*0.004f);
+    }
+
     protected void showConfigurationDialog() {
         try {
             AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
@@ -201,6 +213,8 @@ public abstract class VirtualControllerElement extends View {
                 startSize_x = getWidth();
                 startSize_y = getHeight();
 
+                actionEnableMove();
+
                 return true;
             }
             case MotionEvent.ACTION_MOVE: {
@@ -230,8 +244,7 @@ public abstract class VirtualControllerElement extends View {
             case MotionEvent.ACTION_CANCEL:
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_POINTER_UP: {
-                currentMode = Mode.Normal;
-                showConfigurationDialog();
+                actionCancel();
                 return true;
             }
             default: {

app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java

@@ -109,6 +109,20 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         else {
             LimeLog.info("No HEVC decoder found");
         }
+
+        // Set attributes that are queried in getCapabilities(). This must be done here
+        // because getCapabilities() may be called before setup() in current versions of the common
+        // library. The limitation of this is that we don't know whether we're using HEVC or AVC, so
+        // we just assume AVC. This isn't really a problem because the capabilities are usually
+        // shared between AVC and HEVC decoders on the same device.
+        if (avcDecoderName != null) {
+            directSubmit = MediaCodecHelper.decoderCanDirectSubmit(avcDecoderName);
+            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(avcDecoderName);
+
+            if (directSubmit) {
+                LimeLog.info("Decoder "+avcDecoderName+" will use direct submit");
+            }
+        }
     }
 
     @Override
@@ -171,14 +185,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
             return false;
         }
 
-        // Set decoder-specific attributes
-        directSubmit = MediaCodecHelper.decoderCanDirectSubmit(selectedDecoderName);
-        adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(selectedDecoderName);
-
-        if (directSubmit) {
-            LimeLog.info("Decoder "+selectedDecoderName+" will use direct submit");
-        }
-
         // Codecs have been known to throw all sorts of crazy runtime exceptions
         // due to implementation problems
         try {

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -21,7 +21,7 @@ public class PreferenceConfiguration {
     private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
-    private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_onscreen_controller";
+    private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
 
     private static final int BITRATE_DEFAULT_720_30 = 5;
     private static final int BITRATE_DEFAULT_720_60 = 10;

app/src/main/java/com/limelight/preferences/StreamSettings.java

@@ -2,12 +2,15 @@ package com.limelight.preferences;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.app.Activity;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
 
 import com.limelight.PcView;
 import com.limelight.R;
@@ -60,6 +63,15 @@ public class StreamSettings extends Activity {
             super.onCreate(savedInstanceState);
 
             addPreferencesFromResource(R.xml.preferences);
+            PreferenceScreen screen = getPreferenceScreen();
+
+            // hide on-screen controls category on non touch screen devices
+            if (!getActivity().getPackageManager().
+                    hasSystemFeature("android.hardware.touchscreen")) {
+                PreferenceCategory category =
+                        (PreferenceCategory) findPreference("category_onscreen_controls");
+                screen.removePreference(category);
+            }
 
             // Add a listener to the FPS and resolution preference
             // so the bitrate can be auto-adjusted

app/src/main/res/layout/activity_virtual_controller_settings.xml

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_margin="10dp">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/scrollView">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="vertical">
-
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Load Configuration"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="vertical">
-
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Save Configuration"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="vertical">
-
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Unlock layout"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-            <LinearLayout
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Color 1"/>
-
-                    <ImageView
-                        android:layout_width="200dp"
-                        android:layout_height="100dp"
-                        android:layout_gravity="center_horizontal"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Color 2"/>
-
-                    <ImageView
-                        android:layout_width="200dp"
-
-                        android:layout_height="100dp"
-                        android:layout_gravity="center_horizontal"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </LinearLayout>
-            </LinearLayout>
-                <LinearLayout
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="analog stick time out"/>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textAlignment="center"
-                        android:text="250ms"/>
-
-                    <SeekBar
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

app/src/main/res/values/strings.xml

@@ -106,6 +106,10 @@
     <string name="title_checkbox_xb1_driver">Xbox One controller driver</string>
     <string name="summary_checkbox_xb1_driver">Enables a built-in USB driver for devices without native Xbox One controller support.</string>
 
+    <string name="category_on_screen_controls_settings">On-screen Controls Settings</string>
+    <string name="title_checkbox_show_onscreen_controls">Show on-screen controls</string>
+    <string name="summary_checkbox_show_onscreen_controls">Show virtual controller overlay on touchscreen</string>
+
     <string name="category_ui_settings">UI Settings</string>
     <string name="title_language_list">Language</string>
     <string name="summary_language_list">Language to use for Moonlight</string>

app/src/main/res/xml/preferences.xml

@@ -50,11 +50,14 @@
             android:title="@string/title_checkbox_xb1_driver"
             android:summary="@string/summary_checkbox_xb1_driver"
             android:defaultValue="true" />
-        <!--CheckBoxPreference
-            android:key="checkbox_onscreen_controller"
-            android:title="On-screen controls"
-            android:summary="Show virtual controller overlay on touchscreen"
-            android:defaultValue="false"/-->
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/category_on_screen_controls_settings"
+        android:key="category_onscreen_controls">
+        <CheckBoxPreference
+            android:key="checkbox_show_onscreen_controls"
+            android:title="@string/title_checkbox_show_onscreen_controls"
+            android:summary="@string/summary_checkbox_show_onscreen_controls"
+            android:defaultValue="false"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings">
         <CheckBoxPreference