Disable the start key shortcut to start the keyboard because the keyboard can't receive input after it's started

Italian translation: update

app/app.iml

@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugTest" />
@@ -24,6 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/nonRoot/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />

app/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 21
 
-        versionName "3.1-beta1"
-        versionCode = 50
+        versionName "3.1"
+        versionCode = 53
     }
 
     productFlavors {
@@ -62,17 +62,17 @@ android {
 }
 
 dependencies {
-    compile group: 'org.jcodec', name: 'jcodec', version: '+'
+    compile group: 'org.jcodec', name: 'jcodec', version: '0.1.9'
 
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '+'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
 
-    compile group: 'com.google.android', name: 'support-v4', version:'+'
-    compile group: 'com.koushikdutta.ion', name: 'ion', version:'+'
-    compile group: 'com.google.code.gson', name: 'gson', version:'+'
+    compile group: 'com.google.android', name: 'support-v4', version:'r7'
+    compile group: 'com.koushikdutta.ion', name: 'ion', version:'2.0.5'
+    compile group: 'com.google.code.gson', name: 'gson', version:'2.3.1'
 
-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'+'
-    compile group: 'com.squareup.okio', name:'okio', version:'+'
+    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.2.0'
+    compile group: 'com.squareup.okio', name:'okio', version:'1.2.0'
 
     compile files('libs/jmdns-fixed.jar')
     compile files('libs/limelight-common.jar')

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

@@ -1,9 +1,6 @@
 package com.limelight;
 
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -11,15 +8,11 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 
-import org.xmlpull.v1.XmlPullParserException;
-
 import com.limelight.binding.PlatformBinding;
-import com.limelight.binding.crypto.AndroidCryptoProvider;
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.grid.AppGridAdapter;
 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.preferences.PreferenceConfiguration;
@@ -48,7 +41,6 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
@@ -74,7 +66,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     public final static String UUID_EXTRA = "UUID";
 
     private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private ServiceConnection serviceConnection = new ServiceConnection() {
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
             final ComputerManagerService.ComputerManagerBinder localBinder =
                     ((ComputerManagerService.ComputerManagerBinder)binder);
@@ -172,7 +164,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception e) {}
+                } catch (Exception ignored) {}
             }
         });
 
@@ -502,10 +494,11 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             }
         });
         registerForContextMenu(listView);
+        listView.requestFocus();
     }
 
     public class AppObject {
-		public NvApp app;
+        public final NvApp app;
 
         public AppObject(NvApp app) {
             this.app = app;

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

@@ -25,6 +25,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
+import android.hardware.input.InputManager;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
@@ -59,7 +60,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private int lastButtonState = 0;
 
     // Only 2 touches are supported
-	private TouchContext[] touchContextMap = new TouchContext[2];
+    private final TouchContext[] touchContextMap = new TouchContext[2];
     private long threeFingerDownTime = 0;
 
     private static final int THREE_FINGER_TAP_THRESHOLD = 300;
@@ -68,7 +69,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private KeyboardTranslator keybTranslator;
 
     private PreferenceConfiguration prefConfig;
-	private Point screenSize = new Point(0, 0);
+    private final Point screenSize = new Point(0, 0);
 
     private NvConnection conn;
     private SpinnerDialog spinner;
@@ -193,7 +194,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Initialize the connection
         conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
         keybTranslator = new KeyboardTranslator(conn);
-		controllerHandler = new ControllerHandler(conn, this, prefConfig.deadzonePercentage);
+        controllerHandler = new ControllerHandler(conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
+
+        InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
+        inputManager.registerInputDeviceListener(controllerHandler, null);
 
         SurfaceHolder sh = sv.getHolder();
         if (prefConfig.stretchVideo || !decoderRenderer.isHardwareAccelerated()) {
@@ -242,7 +246,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @SuppressLint("InlinedApi")
-	private Runnable hideSystemUi = new Runnable() {
+    private final Runnable hideSystemUi = new Runnable() {
             @Override
             public void run() {
                 // Use immersive mode on 4.4+ or standard low profile on previous builds
@@ -278,6 +282,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         SpinnerDialog.closeDialogs(this);
         Dialog.closeDialogs();
 
+        InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
+        inputManager.unregisterInputDeviceListener(controllerHandler);
+
         displayedFailureDialog = true;
         stopConnection();
 
@@ -308,7 +315,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         wifiLock.release();
     }
 
-	private Runnable toggleGrab = new Runnable() {
+    private final Runnable toggleGrab = new Runnable() {
         @Override
         public void run() {
 

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

@@ -25,7 +25,6 @@ import com.limelight.utils.Dialog;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
-import android.app.FragmentTransaction;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -53,7 +52,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     private PcGridAdapter pcGridAdapter;
     private ComputerManagerService.ComputerManagerBinder managerBinder;
     private boolean freezeUpdates, runningPolling;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
             final ComputerManagerService.ComputerManagerBinder localBinder =
                     ((ComputerManagerService.ComputerManagerBinder)binder);
@@ -255,7 +254,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }
         else {
             menu.add(Menu.NONE, APP_LIST_ID, 1, getResources().getString(R.string.pcview_menu_app_list));
-            menu.add(Menu.NONE, UNPAIR_ID, 2, getResources().getString(R.string.pcview_menu_unpair_pc));
+
+            // FIXME: We used to be able to unpair here but it's been broken since GFE 2.1.x, so I've replaced
+            // it with delete which actually work
+            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
         }
     }
 
@@ -528,7 +530,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 
             // Check if this is the same computer
-			if (details.equals(computer.details)) {
+            if (details.uuid.equals(computer.details.uuid)) {
                 existingEntry = computer;
                 break;
             }

app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -9,7 +9,7 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
 
 public class AndroidAudioRenderer implements AudioRenderer {
 
-	public static final int FRAME_SIZE = 960;
+    private static final int FRAME_SIZE = 960;
 
     private AudioTrack track;
 

app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java

@@ -45,8 +45,8 @@ import com.limelight.nvstream.http.LimelightCryptoProvider;
 
 public class AndroidCryptoProvider implements LimelightCryptoProvider {
 
-	private File certFile;
-	private File keyFile;
+    private final File certFile;
+    private final File keyFile;
 
     private X509Certificate cert;
     private RSAPrivateKey key;

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -1,7 +1,9 @@
 package com.limelight.binding.input;
 
 import java.util.HashMap;
+import java.util.Map;
 
+import android.hardware.input.InputManager;
 import android.os.SystemClock;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -13,26 +15,10 @@ import com.limelight.nvstream.input.ControllerPacket;
 import com.limelight.ui.GameGestures;
 import com.limelight.utils.Vector2d;
 
-public class ControllerHandler {
-	private short inputMap = 0x0000;
-	private byte leftTrigger = 0x00;
-	private byte rightTrigger = 0x00;
-	private short rightStickX = 0x0000;
-	private short rightStickY = 0x0000;
-	private short leftStickX = 0x0000;
-	private short leftStickY = 0x0000;
-	private int emulatingButtonFlags = 0;
+public class ControllerHandler implements InputManager.InputDeviceListener {
 
-	// Used for OUYA bumper state tracking since they force all buttons
-	// up when the OUYA button goes down. We watch the last time we get
-	// a bumper up and compare that to our maximum delay when we receive
-	// a Start button press to see if we should activate one of our 
-	// emulated button combos.
-	private long lastLbUpTime = 0;
-	private long lastRbUpTime = 0;
     private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
 
-    private long startDownTime = 0;
     private static final int START_DOWN_TIME_KEYB_MS = 750;
 
     private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
@@ -43,19 +29,23 @@ public class ControllerHandler {
     private static final int EMULATED_SPECIAL_UP_DELAY_MS = 100;
     private static final int EMULATED_SELECT_UP_DELAY_MS = 30;
 
-	private Vector2d inputVector = new Vector2d();
+    private final Vector2d inputVector = new Vector2d();
 
-	private HashMap<String, ControllerMapping> mappings = new HashMap<String, ControllerMapping>();
+    private final HashMap<String, ControllerContext> contexts = new HashMap<String, ControllerContext>();
 
-	private NvConnection conn;
-    private double stickDeadzone;
-    private final ControllerMapping defaultMapping = new ControllerMapping();
-    private GameGestures gestures;
+    private final NvConnection conn;
+    private final double stickDeadzone;
+    private final ControllerContext defaultContext = new ControllerContext();
+    private final GameGestures gestures;
     private boolean hasGameController;
 
-	public ControllerHandler(NvConnection conn, GameGestures gestures, int deadzonePercentage) {
+    private final boolean multiControllerEnabled;
+    private short currentControllers;
+
+    public ControllerHandler(NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
         this.conn = conn;
         this.gestures = gestures;
+        this.multiControllerEnabled = multiControllerEnabled;
 
         // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
         // is required for controller batching support to work.
@@ -82,15 +72,16 @@ public class ControllerHandler {
 
         this.stickDeadzone = (double)deadzonePercentage / 100.0;
 
-        // Initialize the default mapping for events with no device
-        defaultMapping.leftStickXAxis = MotionEvent.AXIS_X;
-        defaultMapping.leftStickYAxis = MotionEvent.AXIS_Y;
-        defaultMapping.leftStickDeadzoneRadius = (float) stickDeadzone;
-        defaultMapping.rightStickXAxis = MotionEvent.AXIS_Z;
-        defaultMapping.rightStickYAxis = MotionEvent.AXIS_RZ;
-        defaultMapping.rightStickDeadzoneRadius = (float) stickDeadzone;
-        defaultMapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-        defaultMapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        // Initialize the default context for events with no device
+        defaultContext.leftStickXAxis = MotionEvent.AXIS_X;
+        defaultContext.leftStickYAxis = MotionEvent.AXIS_Y;
+        defaultContext.leftStickDeadzoneRadius = (float) stickDeadzone;
+        defaultContext.rightStickXAxis = MotionEvent.AXIS_Z;
+        defaultContext.rightStickYAxis = MotionEvent.AXIS_RZ;
+        defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
+        defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+        defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.controllerNumber = (short) 0;
     }
 
     private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
@@ -106,19 +97,63 @@ public class ControllerHandler {
         return range;
     }
 
-	private ControllerMapping createMappingForDevice(InputDevice dev) {
-		ControllerMapping mapping = new ControllerMapping();
+    private short assignNewControllerNumber() {
+        for (short i = 0; i < 4; i++) {
+            if ((currentControllers & (1 << i)) == 0) {
+                // Found an unused controller value
+                currentControllers |= (1 << i);
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        // Nothing happening here yet
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        for (Map.Entry<String, ControllerContext> device : contexts.entrySet()) {
+            if (device.getValue().id == deviceId) {
+                LimeLog.info("Removed controller: "+device.getValue().name);
+                releaseControllerNumber(device.getValue().controllerNumber);
+                contexts.remove(device.getKey());
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        // Remove and re-add 
+        onInputDeviceRemoved(deviceId);
+        onInputDeviceAdded(deviceId);
+    }
+
+    private void releaseControllerNumber(int controllerNumber) {
+        LimeLog.info("Controller number "+controllerNumber+" is now available");
+        currentControllers &= ~(1 << controllerNumber);
+    }
+
+    private ControllerContext createContextForDevice(InputDevice dev) {
+        ControllerContext context = new ControllerContext();
         String devName = dev.getName();
 
-        LimeLog.info("Creating controller mapping for device: "+devName);
+        LimeLog.info("Creating controller context for device: "+devName);
 
-        mapping.leftStickXAxis = MotionEvent.AXIS_X;
-		mapping.leftStickYAxis = MotionEvent.AXIS_Y;
-        if (getMotionRangeForJoystickAxis(dev, mapping.leftStickXAxis) != null &&
-                getMotionRangeForJoystickAxis(dev, mapping.leftStickYAxis) != null) {
+        context.name = devName;
+        context.id = dev.getId();
+
+        context.leftStickXAxis = MotionEvent.AXIS_X;
+        context.leftStickYAxis = MotionEvent.AXIS_Y;
+        if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
+                getMotionRangeForJoystickAxis(dev, context.leftStickYAxis) != null) {
             // This is a gamepad
             hasGameController = true;
-            mapping.hasJoystickAxes = true;
+            context.hasJoystickAxes = true;
         }
 
         InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER);
@@ -128,14 +163,14 @@ public class ControllerHandler {
         if (leftTriggerRange != null && rightTriggerRange != null)
         {
             // Some controllers use LTRIGGER and RTRIGGER (like Ouya)
-			mapping.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
-			mapping.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
+            context.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
+            context.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
         }
         else if (brakeRange != null && gasRange != null)
         {
             // Others use GAS and BRAKE (like Moga)
-			mapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-			mapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
+            context.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+            context.rightTriggerAxis = MotionEvent.AXIS_GAS;
         }
         else
         {
@@ -144,34 +179,34 @@ public class ControllerHandler {
             if (rxRange != null && ryRange != null && devName != null) {
                 if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
                     // Xbox controllers use RX and RY for right stick
-					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
-					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
+                    context.rightStickXAxis = MotionEvent.AXIS_RX;
+                    context.rightStickYAxis = MotionEvent.AXIS_RY;
 
                     // Xbox controllers use Z and RZ for triggers
-					mapping.leftTriggerAxis = MotionEvent.AXIS_Z;
-					mapping.rightTriggerAxis = MotionEvent.AXIS_RZ;
-					mapping.triggersIdleNegative = true;
-					mapping.isXboxController = true;
+                    context.leftTriggerAxis = MotionEvent.AXIS_Z;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RZ;
+                    context.triggersIdleNegative = true;
+                    context.isXboxController = true;
                 }
                 else {
                     // DS4 controller uses RX and RY for triggers
-					mapping.leftTriggerAxis = MotionEvent.AXIS_RX;
-					mapping.rightTriggerAxis = MotionEvent.AXIS_RY;
-					mapping.triggersIdleNegative = true;
+                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
+                    context.triggersIdleNegative = true;
 
-					mapping.isDualShock4 = true;
+                    context.isDualShock4 = true;
                 }
             }
         }
 
-		if (mapping.rightStickXAxis == -1 && mapping.rightStickYAxis == -1) {
+        if (context.rightStickXAxis == -1 && context.rightStickYAxis == -1) {
             InputDevice.MotionRange zRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z);
             InputDevice.MotionRange rzRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ);
 
             // Most other controllers use Z and RZ for the right stick
             if (zRange != null && rzRange != null) {
-				mapping.rightStickXAxis = MotionEvent.AXIS_Z;
-				mapping.rightStickYAxis = MotionEvent.AXIS_RZ;
+                context.rightStickXAxis = MotionEvent.AXIS_Z;
+                context.rightStickYAxis = MotionEvent.AXIS_RZ;
             }
             else {
                 InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
@@ -179,8 +214,8 @@ public class ControllerHandler {
 
                 // Try RX and RY now
                 if (rxRange != null && ryRange != null) {
-					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
-					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
+                    context.rightStickXAxis = MotionEvent.AXIS_RX;
+                    context.rightStickYAxis = MotionEvent.AXIS_RY;
                 }
             }
         }
@@ -189,30 +224,30 @@ public class ControllerHandler {
         InputDevice.MotionRange hatXRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_X);
         InputDevice.MotionRange hatYRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_Y);
         if (hatXRange != null && hatYRange != null) {
-			mapping.hatXAxis = MotionEvent.AXIS_HAT_X;
-			mapping.hatYAxis = MotionEvent.AXIS_HAT_Y;
+            context.hatXAxis = MotionEvent.AXIS_HAT_X;
+            context.hatYAxis = MotionEvent.AXIS_HAT_Y;
         }
 
-		if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
-            mapping.leftStickDeadzoneRadius = (float) stickDeadzone;
+        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
+            context.leftStickDeadzoneRadius = (float) stickDeadzone;
         }
 
-		if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
-            mapping.rightStickDeadzoneRadius = (float) stickDeadzone;
+        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
+            context.rightStickDeadzoneRadius = (float) stickDeadzone;
         }
 
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
-            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, mapping.leftTriggerAxis);
-            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, mapping.rightTriggerAxis);
+        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
+            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, context.leftTriggerAxis);
+            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, context.rightTriggerAxis);
 
             // It's important to have a valid deadzone so controller packet batching works properly
-            mapping.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
+            context.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
 
             // For triggers without (valid) deadzones, we'll use 13% (around XInput's default)
-            if (mapping.triggerDeadzone < 0.13f ||
-                mapping.triggerDeadzone > 0.30f)
+            if (context.triggerDeadzone < 0.13f ||
+                context.triggerDeadzone > 0.30f)
             {
-                mapping.triggerDeadzone = 0.13f;
+                context.triggerDeadzone = 0.13f;
             }
         }
 
@@ -226,71 +261,86 @@ public class ControllerHandler {
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
                     boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
                     if (!hasStartKey[0] && !hasStartKey[1]) {
-                        mapping.backIsStart = true;
+                        context.backIsStart = true;
+                        context.modeIsSelect = true;
                     }
                 }
 
                 // The ASUS Gamepad has triggers that sit far forward and are prone to false presses
                 // so we increase the deadzone on them to minimize this
-                mapping.triggerDeadzone = 0.30f;
+                context.triggerDeadzone = 0.30f;
             }
             // Classify this device as a remote by name
             else if (devName.contains("Fire TV Remote") || devName.contains("Nexus Remote")) {
                 // It's only a remote if it doesn't any sticks
-                if (!mapping.hasJoystickAxes) {
-                    mapping.isRemote = true;
+                if (!context.hasJoystickAxes) {
+                    context.isRemote = true;
                 }
             }
             // NYKO Playpad has a fake hat that mimics the left stick for some reason
             else if (devName.contains("NYKO PLAYPAD")) {
-                mapping.hatXAxis = -1;
-                mapping.hatYAxis = -1;
+                context.hatXAxis = -1;
+                context.hatYAxis = -1;
             }
         }
 
-        LimeLog.info("Analog stick deadzone: "+mapping.leftStickDeadzoneRadius+" "+mapping.rightStickDeadzoneRadius);
-        LimeLog.info("Trigger deadzone: "+mapping.triggerDeadzone);
+        LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
+        LimeLog.info("Trigger deadzone: "+context.triggerDeadzone);
 
-		return mapping;
+        if (devName != null && devName.equals("gpio-keys")) {
+            // This is the back button on Shield portable consoles
+            context.controllerNumber = 0;
+        }
+        else if (multiControllerEnabled) {
+            context.controllerNumber = assignNewControllerNumber();
+        }
+        else {
+            context.controllerNumber = 0;
+        }
+        LimeLog.info("Assigned as controller "+context.controllerNumber);
+
+        return context;
     }
 
-	private ControllerMapping getMappingForDevice(InputDevice dev) {
-		// Unknown devices use the default mapping
+    private ControllerContext getContextForDevice(InputDevice dev) {
+        // Unknown devices use the default context
         if (dev == null) {
-			return defaultMapping;
+            return defaultContext;
         }
 
         String descriptor = dev.getDescriptor();
 
-		// Return the existing mapping if it exists
-		ControllerMapping mapping = mappings.get(descriptor);
-		if (mapping != null) {
-			return mapping;
+        // Return the existing context if it exists
+        ControllerContext context = contexts.get(descriptor);
+        if (context != null) {
+            return context;
         }
 
-		// Otherwise create a new mapping
-		mapping = createMappingForDevice(dev);
-		mappings.put(descriptor, mapping);
+        // Otherwise create a new context
+        context = createContextForDevice(dev);
+        contexts.put(descriptor, context);
 
-		return mapping;
+        return context;
     }
 
-	private void sendControllerInputPacket() {
-		conn.sendControllerInput(inputMap, leftTrigger, rightTrigger,
-				leftStickX, leftStickY, rightStickX, rightStickY);
+    private void sendControllerInputPacket(ControllerContext context) {
+        conn.sendControllerInput(context.controllerNumber, context.inputMap,
+                context.leftTrigger, context.rightTrigger,
+                context.leftStickX, context.leftStickY,
+                context.rightStickX, context.rightStickY);
     }
 
     // Return a valid keycode, 0 to consume, or -1 to not consume the event
     // Device MAY BE NULL
-	private int handleRemapping(ControllerMapping mapping, KeyEvent event) {
+    private int handleRemapping(ControllerContext context, KeyEvent event) {
         // For remotes, don't capture the back button
-		if (mapping.isRemote) {
+        if (context.isRemote) {
             if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
                 return -1;
             }
         }
 
-        if (mapping.isDualShock4) {
+        if (context.isDualShock4) {
             switch (event.getKeyCode()) {
             case KeyEvent.KEYCODE_BUTTON_Y:
                 return KeyEvent.KEYCODE_BUTTON_L1;
@@ -329,7 +379,7 @@ public class ControllerHandler {
             }
         }
 
-		if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
             switch (event.getKeyCode()) {
             // These are duplicate dpad events for hat input
             case KeyEvent.KEYCODE_DPAD_LEFT:
@@ -340,9 +390,9 @@ public class ControllerHandler {
                 return 0;
             }
         }
-		else if (mapping.hatXAxis == -1 &&
-				 mapping.hatYAxis == -1 &&
-				 mapping.isXboxController &&
+        else if (context.hatXAxis == -1 &&
+                 context.hatYAxis == -1 &&
+                 context.isXboxController &&
                  event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
             // If there's not a proper Xbox controller mapping, we'll translate the raw d-pad
             // scan codes into proper key codes
@@ -375,12 +425,20 @@ public class ControllerHandler {
         if (keyCode == KeyEvent.KEYCODE_BUTTON_START ||
                 keyCode == KeyEvent.KEYCODE_MENU) {
             // Ensure that we never use back as start if we have a real start
-            mapping.backIsStart = false;
+            context.backIsStart = false;
         }
-        else if (mapping.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
+        else if (keyCode == KeyEvent.KEYCODE_BUTTON_SELECT) {
+            // Don't use mode as select if we have a select
+            context.modeIsSelect = false;
+        }
+        else if (context.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
             // Emulate the start button with back
             return KeyEvent.KEYCODE_BUTTON_START;
         }
+        else if (context.modeIsSelect && keyCode == KeyEvent.KEYCODE_BUTTON_MODE) {
+            // Emulate the select button with mode
+            return KeyEvent.KEYCODE_BUTTON_SELECT;
+        }
 
         return keyCode;
     }
@@ -402,101 +460,101 @@ public class ControllerHandler {
         // evaluates the deadzone.
     }
 
-    private void handleAxisSet(ControllerMapping mapping, float lsX, float lsY, float rsX,
+    private void handleAxisSet(ControllerContext context, float lsX, float lsY, float rsX,
                                float rsY, float lt, float rt, float hatX, float hatY) {
 
-        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
             Vector2d leftStickVector = populateCachedVector(lsX, lsY);
 
-            handleDeadZone(leftStickVector, mapping.leftStickDeadzoneRadius);
+            handleDeadZone(leftStickVector, context.leftStickDeadzoneRadius);
 
-            leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
-            leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
+            context.leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
+            context.leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
         }
 
-        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
             Vector2d rightStickVector = populateCachedVector(rsX, rsY);
 
-            handleDeadZone(rightStickVector, mapping.rightStickDeadzoneRadius);
+            handleDeadZone(rightStickVector, context.rightStickDeadzoneRadius);
 
-            rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
-            rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
+            context.rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
+            context.rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
         }
 
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
-            if (mapping.triggersIdleNegative) {
+        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
+            if (context.triggersIdleNegative) {
                 lt = (lt + 1) / 2;
                 rt = (rt + 1) / 2;
             }
 
-            if (lt <= mapping.triggerDeadzone) {
+            if (lt <= context.triggerDeadzone) {
                 lt = 0;
             }
-            if (rt <= mapping.triggerDeadzone) {
+            if (rt <= context.triggerDeadzone) {
                 rt = 0;
             }
 
-            leftTrigger = (byte)(lt * 0xFF);
-            rightTrigger = (byte)(rt * 0xFF);
+            context.leftTrigger = (byte)(lt * 0xFF);
+            context.rightTrigger = (byte)(rt * 0xFF);
         }
 
-        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
-            inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
+        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
+            context.inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
             if (hatX < -0.5) {
-                inputMap |= ControllerPacket.LEFT_FLAG;
+                context.inputMap |= ControllerPacket.LEFT_FLAG;
             }
             else if (hatX > 0.5) {
-                inputMap |= ControllerPacket.RIGHT_FLAG;
+                context.inputMap |= ControllerPacket.RIGHT_FLAG;
             }
 
-            inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
+            context.inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
             if (hatY < -0.5) {
-                inputMap |= ControllerPacket.UP_FLAG;
+                context.inputMap |= ControllerPacket.UP_FLAG;
             }
             else if (hatY > 0.5) {
-                inputMap |= ControllerPacket.DOWN_FLAG;
+                context.inputMap |= ControllerPacket.DOWN_FLAG;
             }
         }
 
-        sendControllerInputPacket();
+        sendControllerInputPacket(context);
     }
 
     public boolean handleMotionEvent(MotionEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        ControllerContext context = getContextForDevice(event.getDevice());
         float lsX = 0, lsY = 0, rsX = 0, rsY = 0, rt = 0, lt = 0, hatX = 0, hatY = 0;
 
         // We purposefully ignore the historical values in the motion event as it makes
         // the controller feel sluggish for some users.
 
-        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
-            lsX = event.getAxisValue(mapping.leftStickXAxis);
-            lsY = event.getAxisValue(mapping.leftStickYAxis);
+        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
+            lsX = event.getAxisValue(context.leftStickXAxis);
+            lsY = event.getAxisValue(context.leftStickYAxis);
         }
 
-        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
-            rsX = event.getAxisValue(mapping.rightStickXAxis);
-            rsY = event.getAxisValue(mapping.rightStickYAxis);
+        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
+            rsX = event.getAxisValue(context.rightStickXAxis);
+            rsY = event.getAxisValue(context.rightStickYAxis);
         }
 
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
-            lt = event.getAxisValue(mapping.leftTriggerAxis);
-            rt = event.getAxisValue(mapping.rightTriggerAxis);
+        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
+            lt = event.getAxisValue(context.leftTriggerAxis);
+            rt = event.getAxisValue(context.rightTriggerAxis);
         }
 
-        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
             hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X);
             hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
         }
 
-        handleAxisSet(mapping, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
+        handleAxisSet(context, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
 
         return true;
     }
 
     public boolean handleButtonUp(KeyEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        ControllerContext context = getContextForDevice(event.getDevice());
 
-        int keyCode = handleRemapping(mapping, event);
+        int keyCode = handleRemapping(context, event);
         if (keyCode == 0) {
             return true;
         }
@@ -515,78 +573,80 @@ public class ControllerHandler {
 
         switch (keyCode) {
         case KeyEvent.KEYCODE_BUTTON_MODE:
-			inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+            context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
         case KeyEvent.KEYCODE_MENU:
-            if (SystemClock.uptimeMillis() - startDownTime > ControllerHandler.START_DOWN_TIME_KEYB_MS) {
-                gestures.showKeyboard();
+            if (SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_KEYB_MS) {
+                // FIXME: The stock keyboard doesn't have controller focus so isn't usable. I'm not enabling this shortcut
+                // until we have a custom keyboard or some other fix
+                //gestures.showKeyboard();
             }
-			inputMap &= ~ControllerPacket.PLAY_FLAG;
+            context.inputMap &= ~ControllerPacket.PLAY_FLAG;
             break;
         case KeyEvent.KEYCODE_BACK:
         case KeyEvent.KEYCODE_BUTTON_SELECT:
-			inputMap &= ~ControllerPacket.BACK_FLAG;
+            context.inputMap &= ~ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
-			inputMap &= ~ControllerPacket.LEFT_FLAG;
+            context.inputMap &= ~ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
-			inputMap &= ~ControllerPacket.RIGHT_FLAG;
+            context.inputMap &= ~ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
-			inputMap &= ~ControllerPacket.UP_FLAG;
+            context.inputMap &= ~ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
-			inputMap &= ~ControllerPacket.DOWN_FLAG;
+            context.inputMap &= ~ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
-			inputMap &= ~ControllerPacket.B_FLAG;
+            context.inputMap &= ~ControllerPacket.B_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_CENTER:
         case KeyEvent.KEYCODE_BUTTON_A:
-			inputMap &= ~ControllerPacket.A_FLAG;
+            context.inputMap &= ~ControllerPacket.A_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_X:
-			inputMap &= ~ControllerPacket.X_FLAG;
+            context.inputMap &= ~ControllerPacket.X_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_Y:
-			inputMap &= ~ControllerPacket.Y_FLAG;
+            context.inputMap &= ~ControllerPacket.Y_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L1:
-			inputMap &= ~ControllerPacket.LB_FLAG;
-			lastLbUpTime = SystemClock.uptimeMillis();
+            context.inputMap &= ~ControllerPacket.LB_FLAG;
+            context.lastLbUpTime = SystemClock.uptimeMillis();
             break;
         case KeyEvent.KEYCODE_BUTTON_R1:
-			inputMap &= ~ControllerPacket.RB_FLAG;
-			lastRbUpTime = SystemClock.uptimeMillis();
+            context.inputMap &= ~ControllerPacket.RB_FLAG;
+            context.lastRbUpTime = SystemClock.uptimeMillis();
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBL:
-			inputMap &= ~ControllerPacket.LS_CLK_FLAG;
+            context.inputMap &= ~ControllerPacket.LS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBR:
-			inputMap &= ~ControllerPacket.RS_CLK_FLAG;
+            context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-			leftTrigger = 0;
+            context.leftTrigger = 0;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-			rightTrigger = 0;
+            context.rightTrigger = 0;
             break;
         default:
             return false;
         }
 
         // Check if we're emulating the select button
-		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
         {
             // If either start or LB is up, select comes up too
-			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-				(inputMap & ControllerPacket.LB_FLAG) == 0)
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+                (context.inputMap & ControllerPacket.LB_FLAG) == 0)
             {
-				inputMap &= ~ControllerPacket.BACK_FLAG;
+                context.inputMap &= ~ControllerPacket.BACK_FLAG;
 
-				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
 
                 try {
                     Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
@@ -595,16 +655,16 @@ public class ControllerHandler {
         }
 
         // Check if we're emulating the special button
-		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
         {
             // If either start or select and RB is up, the special button comes up too
-			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-				((inputMap & ControllerPacket.BACK_FLAG) == 0 &&
-				 (inputMap & ControllerPacket.RB_FLAG) == 0))
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+                ((context.inputMap & ControllerPacket.BACK_FLAG) == 0 &&
+                 (context.inputMap & ControllerPacket.RB_FLAG) == 0))
             {
-				inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+                context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
 
-				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
 
                 try {
                     Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
@@ -612,112 +672,115 @@ public class ControllerHandler {
             }
         }
 
-		sendControllerInputPacket();
+        sendControllerInputPacket(context);
         return true;
     }
 
     public boolean handleButtonDown(KeyEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        ControllerContext context = getContextForDevice(event.getDevice());
 
-        int keyCode = handleRemapping(mapping, event);
+        int keyCode = handleRemapping(context, event);
         if (keyCode == 0) {
             return true;
         }
 
         switch (keyCode) {
         case KeyEvent.KEYCODE_BUTTON_MODE:
-			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
         case KeyEvent.KEYCODE_MENU:
             if (event.getRepeatCount() == 0) {
-                startDownTime = SystemClock.uptimeMillis();
+                context.startDownTime = SystemClock.uptimeMillis();
             }
-			inputMap |= ControllerPacket.PLAY_FLAG;
+            context.inputMap |= ControllerPacket.PLAY_FLAG;
             break;
         case KeyEvent.KEYCODE_BACK:
         case KeyEvent.KEYCODE_BUTTON_SELECT:
-			inputMap |= ControllerPacket.BACK_FLAG;
+            context.inputMap |= ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
-			inputMap |= ControllerPacket.LEFT_FLAG;
+            context.inputMap |= ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
-			inputMap |= ControllerPacket.RIGHT_FLAG;
+            context.inputMap |= ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
-			inputMap |= ControllerPacket.UP_FLAG;
+            context.inputMap |= ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
-			inputMap |= ControllerPacket.DOWN_FLAG;
+            context.inputMap |= ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
-			inputMap |= ControllerPacket.B_FLAG;
+            context.inputMap |= ControllerPacket.B_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_CENTER:
         case KeyEvent.KEYCODE_BUTTON_A:
-			inputMap |= ControllerPacket.A_FLAG;
+            context.inputMap |= ControllerPacket.A_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_X:
-			inputMap |= ControllerPacket.X_FLAG;
+            context.inputMap |= ControllerPacket.X_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_Y:
-			inputMap |= ControllerPacket.Y_FLAG;
+            context.inputMap |= ControllerPacket.Y_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L1:
-			inputMap |= ControllerPacket.LB_FLAG;
+            context.inputMap |= ControllerPacket.LB_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_R1:
-			inputMap |= ControllerPacket.RB_FLAG;
+            context.inputMap |= ControllerPacket.RB_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBL:
-			inputMap |= ControllerPacket.LS_CLK_FLAG;
+            context.inputMap |= ControllerPacket.LS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBR:
-			inputMap |= ControllerPacket.RS_CLK_FLAG;
+            context.inputMap |= ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-			leftTrigger = (byte)0xFF;
+            context.leftTrigger = (byte)0xFF;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-			rightTrigger = (byte)0xFF;
+            context.rightTrigger = (byte)0xFF;
             break;
         default:
             return false;
         }
 
         // Start+LB acts like select for controllers with one button
-		if ((inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-			((inputMap & ControllerPacket.LB_FLAG) != 0 ||
-			  SystemClock.uptimeMillis() - lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+        if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
+            ((context.inputMap & ControllerPacket.LB_FLAG) != 0 ||
+              SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
         {
-			inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
-			inputMap |= ControllerPacket.BACK_FLAG;
+            context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+            context.inputMap |= ControllerPacket.BACK_FLAG;
 
-			emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
         }
 
         // We detect select+start or start+RB as the special button combo
-		if (((inputMap & ControllerPacket.RB_FLAG) != 0 ||
-			 (SystemClock.uptimeMillis() - lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-			 (inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-			(inputMap & ControllerPacket.PLAY_FLAG) != 0)
+        if (((context.inputMap & ControllerPacket.RB_FLAG) != 0 ||
+             (SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
+             (context.inputMap & ControllerPacket.BACK_FLAG) != 0) &&
+            (context.inputMap & ControllerPacket.PLAY_FLAG) != 0)
         {
-			inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
-			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+            context.inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
 
-			emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
         }
 
         // Send a new input packet if this is the first instance of a button down event
         // or anytime if we're emulating a button
-        if (event.getRepeatCount() == 0 || emulatingButtonFlags != 0) {
-            sendControllerInputPacket();
+        if (event.getRepeatCount() == 0 || context.emulatingButtonFlags != 0) {
+            sendControllerInputPacket(context);
         }
         return true;
     }
 
-	class ControllerMapping {
+    class ControllerContext {
+        public String name;
+        public int id;
+
         public int leftStickXAxis = -1;
         public int leftStickYAxis = -1;
         public float leftStickDeadzoneRadius;
@@ -737,7 +800,29 @@ public class ControllerHandler {
         public boolean isDualShock4;
         public boolean isXboxController;
         public boolean backIsStart;
+        public boolean modeIsSelect;
         public boolean isRemote;
         public boolean hasJoystickAxes;
+
+        public short controllerNumber;
+
+        public short inputMap = 0x0000;
+        public byte leftTrigger = 0x00;
+        public byte rightTrigger = 0x00;
+        public short rightStickX = 0x0000;
+        public short rightStickY = 0x0000;
+        public short leftStickX = 0x0000;
+        public short leftStickY = 0x0000;
+        public int emulatingButtonFlags = 0;
+
+        // Used for OUYA bumper state tracking since they force all buttons
+        // up when the OUYA button goes down. We watch the last time we get
+        // a bumper up and compare that to our maximum delay when we receive
+        // a Start button press to see if we should activate one of our
+        // emulated button combos.
+        public long lastLbUpTime = 0;
+        public long lastRbUpTime = 0;
+
+        public long startDownTime = 0;
     }
 }

app/src/main/java/com/limelight/binding/input/KeyboardTranslator.java

@@ -15,7 +15,7 @@ public class KeyboardTranslator extends KeycodeTranslator {
 	/**
 	 * GFE's prefix for every key code
 	 */
-	public static final short KEY_PREFIX = (short) 0x80;
+	private static final short KEY_PREFIX = (short) 0x80;
 	
 	public static final int VK_0 = 48;
 	public static final int VK_9 = 57;

app/src/main/java/com/limelight/binding/input/TouchContext.java

@@ -11,9 +11,10 @@ public class TouchContext {
     private long originalTouchTime = 0;
     private boolean cancelled;
 
-	private NvConnection conn;
-	private int actionIndex;
-    private double xFactor, yFactor;
+    private final NvConnection conn;
+    private final int actionIndex;
+    private final double xFactor;
+    private final double yFactor;
 
     private static final int TAP_MOVEMENT_THRESHOLD = 10;
     private static final int TAP_TIME_THRESHOLD = 250;

app/src/main/java/com/limelight/binding/input/evdev/EvdevEvent.java

@@ -29,9 +29,9 @@ public class EvdevEvent {
     /* Keys */
     public static final short KEY_Q = 16;
 
-	public short type;
-	public short code;
-	public int value;
+    public final short type;
+    public final short code;
+    public final int value;
 
     public EvdevEvent(short type, short code, int value) {
         this.type = type;

app/src/main/java/com/limelight/binding/input/evdev/EvdevHandler.java

@@ -7,12 +7,12 @@ import com.limelight.LimeLog;
 
 public class EvdevHandler {
 
-	private String absolutePath;
-	private EvdevListener listener;
+    private final String absolutePath;
+    private final EvdevListener listener;
     private boolean shutdown = false;
     private int fd = -1;
 
-	private Thread handlerThread = new Thread() {
+    private final Thread handlerThread = new Thread() {
         @Override
         public void run() {
             // All the finally blocks here make this code look like a mess

app/src/main/java/com/limelight/binding/input/evdev/EvdevReader.java

@@ -26,7 +26,7 @@ public class EvdevReader {
         // 4.4 and later to do live SELinux policy changes.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             EvdevShell shell = EvdevShell.getInstance();
-            shell.runCommand("supolicy --live \"allow untrusted_app input_device dir { getattr read search }\" " +
+            shell.runCommand("supolicy --live \"allow untrusted_app input_device dir { open getattr read search }\" " +
                     "\"allow untrusted_app input_device chr_file { open read write ioctl }\"");
         }
     }

app/src/main/java/com/limelight/binding/input/evdev/EvdevTranslator.java

@@ -4,7 +4,7 @@ import android.view.KeyEvent;
 
 public class EvdevTranslator {
 
-	public static final short EVDEV_KEY_CODES[] = {
+    private static final short[] EVDEV_KEY_CODES = {
         0, //KeyEvent.VK_RESERVED
         KeyEvent.KEYCODE_ESCAPE,
         KeyEvent.KEYCODE_1,

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

@@ -36,7 +36,7 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
     private int totalFrames;
     private long totalTimeMs;
 
-	private int cpuCount = Runtime.getRuntime().availableProcessors();
+    private final int cpuCount = Runtime.getRuntime().availableProcessors();
 
     @SuppressWarnings("unused")
     private int findOptimalPerformanceLevel() {

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

@@ -558,8 +558,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     public class RendererException extends RuntimeException {
         private static final long serialVersionUID = 8985937536997012406L;
 
-		private Exception originalException;
-		private MediaCodecDecoderRenderer renderer;
+        private final Exception originalException;
+        private final MediaCodecDecoderRenderer renderer;
         private ByteBuffer currentBuffer;
         private int currentCodecFlags;
 

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

@@ -20,12 +20,12 @@ import com.limelight.LimeLog;
 
 public class MediaCodecHelper {
 	
-	public static final List<String> preferredDecoders;
+	private static final List<String> preferredDecoders;
 
-	public static final List<String> blacklistedDecoderPrefixes;
-	public static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	public static final List<String> whitelistedAdaptiveResolutionPrefixes;
-    public static final List<String> baselineProfileHackPrefixes;
+	private static final List<String> blacklistedDecoderPrefixes;
+	private static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
+	private static final List<String> whitelistedAdaptiveResolutionPrefixes;
+    private static final List<String> baselineProfileHackPrefixes;
 	
 	static {
 		preferredDecoders = new LinkedList<String>();
@@ -146,7 +146,7 @@ public class MediaCodecHelper {
 		return str;
 	}
 	
-	public static MediaCodecInfo findPreferredDecoder() {
+	private static MediaCodecInfo findPreferredDecoder() {
 		// This is a different algorithm than the other findXXXDecoder functions,
 		// because we want to evaluate the decoders in our list's order
 		// rather than MediaCodecList's order
@@ -217,7 +217,7 @@ public class MediaCodecHelper {
 	// since some bad decoders can throw IllegalArgumentExceptions unexpectedly
 	// and we want to be sure all callers are handling this possibility
 	@SuppressWarnings("RedundantThrows")
-    public static MediaCodecInfo findKnownSafeDecoder() throws Exception {
+    private static MediaCodecInfo findKnownSafeDecoder() throws Exception {
 		for (MediaCodecInfo codecInfo : getMediaCodecList()) {		
 			// Skip encoders
 			if (codecInfo.isEncoder()) {

app/src/main/java/com/limelight/computers/ComputerManagerService.java

@@ -1,6 +1,5 @@
 package com.limelight.computers;
 
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.StringReader;
@@ -33,15 +32,15 @@ public class ComputerManagerService extends Service {
     private static final int POLLING_PERIOD_MS = 3000;
     private static final int MDNS_QUERY_PERIOD_MS = 1000;
 
-	private ComputerManagerBinder binder = new ComputerManagerBinder();
+    private final ComputerManagerBinder binder = new ComputerManagerBinder();
 
     private ComputerDatabaseManager dbManager;
-	private AtomicInteger dbRefCount = new AtomicInteger(0);
+    private final AtomicInteger dbRefCount = new AtomicInteger(0);
 
     private IdentityManager idManager;
     private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
     private ComputerManagerListener listener = null;
-	private AtomicInteger activePolls = new AtomicInteger(0);
+    private final AtomicInteger activePolls = new AtomicInteger(0);
     private boolean pollingActive = false;
 
     private DiscoveryService.DiscoveryBinder discoveryBinder;
@@ -65,10 +64,8 @@ public class ComputerManagerService extends Service {
     };
 
     // Returns true if the details object was modified
-    private boolean runPoll(ComputerDetails details)
+    private boolean runPoll(ComputerDetails details, boolean newPc)
     {
-        boolean newPc = details.name.isEmpty();
-
         if (!getLocalDatabaseReference()) {
             return false;
         }
@@ -113,7 +110,7 @@ public class ComputerManagerService extends Service {
             public void run() {
                 while (!isInterrupted() && pollingActive) {
                     // Check if this poll has modified the details
-                    runPoll(details);
+                    runPoll(details, false);
 
                     // Wait until the next polling interval
                     try {
@@ -177,10 +174,6 @@ public class ComputerManagerService extends Service {
             return ComputerManagerService.this.addComputerBlocking(addr);
         }
 
-		public void addComputer(InetAddress addr) {
-			ComputerManagerService.this.addComputer(addr);
-		}
-		
         public void removeComputer(String name) {
             ComputerManagerService.this.removeComputer(name);
         }
@@ -239,7 +232,7 @@ public class ComputerManagerService extends Service {
             @Override
             public void notifyComputerAdded(MdnsComputer computer) {
                 // Kick off a serverinfo poll on this machine
-				addComputer(computer.getAddress());
+                addComputerBlocking(computer.getAddress());
             }
 
             @Override
@@ -255,28 +248,11 @@ public class ComputerManagerService extends Service {
         };
     }
 
-	public void addComputer(InetAddress addr) {
-		// Setup a placeholder
-		ComputerDetails fakeDetails = new ComputerDetails();
-		fakeDetails.localIp = addr;
-		fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
-
-        addTuple(fakeDetails);
-	}
-
     private void addTuple(ComputerDetails details) {
         synchronized (pollingTuples) {
             for (PollingTuple tuple : pollingTuples) {
                 // Check if this is the same computer
-                if (tuple.computer == details ||
-                        // If there's no name on one of these computers, compare with the local IP
-                        ((details.name.isEmpty() || tuple.computer.name.isEmpty()) &&
-                                tuple.computer.localIp.equals(details.localIp)) ||
-                        // If there is a name on both computers, compare with name
-                        ((!details.name.isEmpty() && !tuple.computer.name.isEmpty()) &&
-                                tuple.computer.name.equals(details.name))) {
-
+                if (tuple.computer.uuid.equals(details.uuid)) {
                     // Update details anyway in case this machine has been re-added by IP
                     // after not being reachable by our existing information
                     tuple.computer.localIp = details.localIp;
@@ -307,13 +283,14 @@ public class ComputerManagerService extends Service {
         ComputerDetails fakeDetails = new ComputerDetails();
         fakeDetails.localIp = addr;
         fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
 
         // Block while we try to fill the details
-        runPoll(fakeDetails);
+        runPoll(fakeDetails, true);
 
         // If the machine is reachable, it was successful
         if (fakeDetails.state == ComputerDetails.State.ONLINE) {
+            LimeLog.info("New PC ("+fakeDetails.name+") is UUID "+fakeDetails.uuid);
+
             // Start a polling thread for this machine
             addTuple(fakeDetails);
             return true;
@@ -491,8 +468,8 @@ public class ComputerManagerService extends Service {
 
     public class ApplistPoller {
         private Thread thread;
-        private ComputerDetails computer;
-        private Object pollEvent = new Object();
+        private final ComputerDetails computer;
+        private final Object pollEvent = new Object();
 
         public ApplistPoller(ComputerDetails computer) {
             this.computer = computer;
@@ -593,7 +570,7 @@ public class ComputerManagerService extends Service {
 
 class PollingTuple {
     public Thread thread;
-    public ComputerDetails computer;
+    public final ComputerDetails computer;
 
     public PollingTuple(ComputerDetails computer, Thread thread) {
         this.computer = computer;

app/src/main/java/com/limelight/discovery/DiscoveryService.java

@@ -70,7 +70,7 @@ public class DiscoveryService extends Service {
         });
     }
 
-	private DiscoveryBinder binder = new DiscoveryBinder();
+    private final DiscoveryBinder binder = new DiscoveryBinder();
 
     @Override
     public IBinder onBind(Intent intent) {

app/src/main/java/com/limelight/grid/AppGridAdapter.java

@@ -4,12 +4,10 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.koushikdutta.async.future.FutureCallback;
-import com.koushikdutta.ion.ImageViewBitmapInfo;
 import com.koushikdutta.ion.Ion;
 import com.limelight.AppView;
 import com.limelight.LimeLog;
@@ -19,10 +17,6 @@ import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.LimelightCryptoProvider;
 import com.limelight.utils.CacheHelper;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,7 +30,6 @@ import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Future;
 
@@ -51,10 +44,10 @@ import java.security.cert.X509Certificate;
 
 public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
 
-    private ComputerDetails computer;
-    private String uniqueId;
-    private LimelightCryptoProvider cryptoProvider;
-    private SSLContext sslContext;
+    private final ComputerDetails computer;
+    private final String uniqueId;
+    private final LimelightCryptoProvider cryptoProvider;
+    private final SSLContext sslContext;
     private final HashMap<ImageView, Future> pendingRequests = new HashMap<ImageView, Future>();
 
     public AppGridAdapter(Context context, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) throws NoSuchAlgorithmException, KeyManagementException {
@@ -69,7 +62,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         sslContext.init(ourKeyman, trustAllCerts, new SecureRandom());
     }
 
-    TrustManager[] trustAllCerts = new TrustManager[] {
+    private final TrustManager[] trustAllCerts = new TrustManager[] {
             new X509TrustManager() {
                 public X509Certificate[] getAcceptedIssuers() {
                     return new X509Certificate[0];
@@ -78,7 +71,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                 public void checkServerTrusted(X509Certificate[] certs, String authType) {}
             }};
 
-    KeyManager[] ourKeyman = new KeyManager[] {
+    private final KeyManager[] ourKeyman = new KeyManager[] {
             new X509KeyManager() {
                 public String chooseClientAlias(String[] keyTypes,
                                                 Principal[] issuers, Socket socket) {
@@ -172,8 +165,8 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
 
     @Override
     public boolean populateImageView(final ImageView imgView, final AppView.AppObject obj) {
-        // Hide the image view while we're loading the image from disk cache
-        imgView.setVisibility(View.INVISIBLE);
+        // Clear existing contents of the image view
+        imgView.setAlpha(0.0f);
 
         // Check the on-disk cache
         new ImageCacheRequest(imgView, obj.app.getAppId()).execute();
@@ -203,8 +196,8 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     }
 
     private class ImageCacheRequest extends AsyncTask<Void, Void, Bitmap> {
-        private ImageView view;
-        private int appId;
+        private final ImageView view;
+        private final int appId;
 
         public ImageCacheRequest(ImageView view, int appId) {
             this.view = view;
@@ -223,19 +216,23 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                 if (in != null) {
                     try {
                         in.close();
-                    } catch (IOException e) {}
+                    } catch (IOException ignored) {}
                 }
             }
             return null;
         }
 
+        private void fadeInImage(ImageView view) {
+            view.animate().alpha(1.0f).setDuration(250).start();
+        }
+
         @Override
         protected void onPostExecute(Bitmap result) {
             if (result != null) {
                 // Disk cache was read successfully
                 LimeLog.info("Image disk cache hit for (" + computer.uuid + ", " + appId + ")");
                 view.setImageBitmap(result);
-                view.setVisibility(View.VISIBLE);
+                fadeInImage(view);
             }
             else {
                 LimeLog.info("Image disk cache miss for ("+computer.uuid+", "+appId+")");
@@ -244,11 +241,12 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
 
                 // Load the placeholder image
                 view.setImageResource(defaultImageRes);
-                view.setVisibility(View.VISIBLE);
+                fadeInImage(view);
 
                 // Set SSL contexts correctly to allow us to authenticate
                 Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setTrustManagers(trustAllCerts);
                 Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setSSLContext(sslContext);
+                Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setHostnameVerifier(hv);
 
                 // Kick off the deferred image load
                 synchronized (pendingRequests) {
@@ -258,7 +256,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                             .asBitmap()
                             .setCallback(new FutureCallback<Bitmap>() {
                                 @Override
-                                public void onCompleted(Exception e, Bitmap result) {
+                                public void onCompleted(Exception e, final Bitmap result) {
                                     synchronized (pendingRequests) {
                                         pendingRequests.remove(view);
                                     }
@@ -266,11 +264,18 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                                     if (result != null) {
                                         // Make the view visible now
                                         view.setImageBitmap(result);
-                                        view.setVisibility(View.VISIBLE);
+                                        fadeInImage(view);
 
-                                        // Populate the disk cache if we got an image back
+                                        // Populate the disk cache if we got an image back.
+                                        // We do it in a new thread because it can be very expensive, especially
+                                        // when we do the initial load where lots of disk I/O is happening at once.
+                                        new Thread() {
+                                            @Override
+                                            public void run() {
                                                 populateBitmapCache(computer.uuid, appId, result);
                                             }
+                                        }.start();
+                                    }
                                     else {
                                         // Leave the loading icon as is (probably should change this eventually...)
                                     }
@@ -280,5 +285,5 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
             }
             }
         }
-    };
+    }
 }

app/src/main/java/com/limelight/grid/GenericGridAdapter.java

@@ -13,11 +13,11 @@ import com.limelight.R;
 import java.util.ArrayList;
 
 public abstract class GenericGridAdapter<T> extends BaseAdapter {
-    protected Context context;
-    protected int defaultImageRes;
-    protected int layoutId;
-    protected ArrayList<T> itemList = new ArrayList<T>();
-    protected LayoutInflater inflater;
+    protected final Context context;
+    protected final int defaultImageRes;
+    protected final int layoutId;
+    protected final ArrayList<T> itemList = new ArrayList<T>();
+    protected final LayoutInflater inflater;
 
     public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
         this.context = context;

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

@@ -14,6 +14,7 @@ import com.limelight.utils.UiHelper;
 import android.app.Activity;
 import android.app.Service;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
@@ -21,15 +22,16 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.view.KeyEvent;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
 public class AddComputerManually extends Activity {
     private TextView hostText;
     private ComputerManagerService.ComputerManagerBinder managerBinder;
-	private LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
+    private final LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
     private Thread addThread;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, final IBinder binder) {
             managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
             startAddThread();
@@ -161,6 +163,12 @@ public class AddComputerManually extends Activity {
 
                     computersToAdd.add(hostText.getText().toString().trim());
                 }
+                else if (actionId == EditorInfo.IME_ACTION_PREVIOUS) {
+                    // This is how the Fire TV dismisses the keyboard
+                    InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(hostText.getWindowToken(), 0);
+                    return false;
+                }
 
                 return false;
             }

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

@@ -2,6 +2,7 @@ package com.limelight.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.preference.PreferenceManager;
 
 public class PreferenceConfiguration {
@@ -16,6 +17,7 @@ public class PreferenceConfiguration {
     private static final String LANGUAGE_PREF_STRING = "list_languages";
     private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
     private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
+    private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
 
     private static final int BITRATE_DEFAULT_720_30 = 5;
     private static final int BITRATE_DEFAULT_720_60 = 10;
@@ -32,6 +34,7 @@ public class PreferenceConfiguration {
     private static final int DEFAULT_DEADZONE = 15;
     public static final String DEFAULT_LANGUAGE = "default";
     private static final boolean DEFAULT_LIST_MODE = false;
+    private static final boolean DEFAULT_MULTI_CONTROLLER = true;
 
     public static final int FORCE_HARDWARE_DECODER = -1;
     public static final int AUTOSELECT_DECODER = 0;
@@ -43,7 +46,7 @@ public class PreferenceConfiguration {
     public int deadzonePercentage;
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
-    public boolean listMode, smallIconMode;
+    public boolean listMode, smallIconMode, multiController;
 
     public static int getDefaultBitrate(String resFpsString) {
         if (resFpsString.equals("720p30")) {
@@ -65,6 +68,12 @@ public class PreferenceConfiguration {
     }
 
     public static boolean getDefaultSmallMode(Context context) {
+        PackageManager manager = context.getPackageManager();
+        if (manager != null && manager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+            // TVs shouldn't use small mode by default
+            return false;
+        }
+
         // Use small mode on anything smaller than a 7" tablet
         return context.getResources().getConfiguration().smallestScreenWidthDp < 600;
     }
@@ -156,6 +165,7 @@ public class PreferenceConfiguration {
         config.playHostAudio = prefs.getBoolean(HOST_AUDIO_PREF_STRING, DEFAULT_HOST_AUDIO);
         config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
         config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
+        config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
 
         return config;
     }

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

@@ -20,10 +20,14 @@ public class SeekBarPreference extends DialogPreference
 
     private SeekBar seekBar;
     private TextView valueText;
-    private Context context;
+    private final Context context;
 
-    private String dialogMessage, suffix;
-    private int defaultValue, maxValue, minValue, currentValue;
+    private final String dialogMessage;
+    private final String suffix;
+    private final int defaultValue;
+    private final int maxValue;
+    private final int minValue;
+    private int currentValue;
 
     public SeekBarPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -127,13 +131,6 @@ public class SeekBarPreference extends DialogPreference
         }
     }
 
-    public void setMax(int max) {
-        this.maxValue = max;
-    }
-    public int getMax() {
-        return this.maxValue;
-    }
-
     public void setProgress(int progress) {
         this.currentValue = progress;
         if (seekBar != null) {

app/src/main/java/com/limelight/utils/CacheHelper.java

@@ -9,8 +9,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.util.Scanner;
 
 public class CacheHelper {
     private static File openPath(boolean createPath, File root, String... path) {

app/src/main/java/com/limelight/utils/Dialog.java

@@ -7,15 +7,16 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 
 public class Dialog implements Runnable {
-	private String title, message;
-	private Activity activity;
-	private boolean endAfterDismiss;
+    private final String title;
+    private final String message;
+    private final Activity activity;
+    private final boolean endAfterDismiss;
 
     private AlertDialog alert;
 
     private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
 
-	public Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
+    private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
     {
         this.activity = activity;
         this.title = title;

app/src/main/java/com/limelight/utils/SpinnerDialog.java

@@ -9,14 +9,15 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 
 public class SpinnerDialog implements Runnable,OnCancelListener {
-	private String title, message;
-	private Activity activity;
+    private final String title;
+    private final String message;
+    private final Activity activity;
     private ProgressDialog progress;
-	private boolean finish;
+    private final boolean finish;
 
     private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
 
-	public SpinnerDialog(Activity activity, String title, String message, boolean finish)
+    private SpinnerDialog(Activity activity, String title, String message, boolean finish)
     {
         this.activity = activity;
         this.title = title;

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

@@ -9,5 +9,7 @@
         android:numColumns="auto_fit"
         android:columnWidth="160dp"
         android:stretchMode="spacingWidth"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -9,5 +9,7 @@
         android:numColumns="auto_fit"
         android:columnWidth="105dp"
         android:stretchMode="spacingWidth"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -6,10 +6,12 @@
     <ListView
         android:id="@+id/fragmentView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="@drawable/list_view_unselected"
         android:fastScrollEnabled="true"
         android:longClickable="false"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:stackFromBottom="false" >
 
     </ListView>

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

@@ -8,5 +8,7 @@
         android:layout_height="fill_parent"
         android:numColumns="auto_fit"
         android:columnWidth="160dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -8,5 +8,7 @@
         android:layout_height="fill_parent"
         android:numColumns="auto_fit"
         android:columnWidth="105dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -95,6 +95,8 @@
     <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
 
     <string name="category_gamepad_settings">Impostazioni Gamepad</string>
+    <string name="title_checkbox_multi_controller">Supporto controller multipli</string>
+    <string name="summary_checkbox_multi_controller">Quando disabilitato, tutti i controllers appaiono come uno solo</string>
     <string name="title_seekbar_deadzone">Aggiusta deadzone degli stick analogici</string>
     <string name="suffix_seekbar_deadzone">%</string>
 

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

@@ -95,6 +95,8 @@
     <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
 
     <string name="category_gamepad_settings">Gamepad Settings</string>
+    <string name="title_checkbox_multi_controller">Multiple controller support</string>
+    <string name="summary_checkbox_multi_controller">When unchecked, all controllers appear as one</string>
     <string name="title_seekbar_deadzone">Adjust analog stick deadzone</string>
     <string name="suffix_seekbar_deadzone">%</string>
 

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

@@ -26,14 +26,19 @@
             android:summary="@string/summary_checkbox_disable_warnings"
             android:defaultValue="false" />
     </PreferenceCategory>
-    <!--PreferenceCategory android:title="@string/category_gamepad_settings">
-        <com.limelight.preferences.SeekBarPreference
+    <PreferenceCategory android:title="@string/category_gamepad_settings">
+        <!--com.limelight.preferences.SeekBarPreference
             android:key="seekbar_deadzone"
             android:defaultValue="15"
             android:max="50"
             android:text="@string/suffix_seekbar_deadzone"
-            android:title="@string/title_seekbar_deadzone"/>
-    </PreferenceCategory-->
+            android:title="@string/title_seekbar_deadzone"/-->
+        <CheckBoxPreference
+            android:key="checkbox_multi_controller"
+            android:title="@string/title_checkbox_multi_controller"
+            android:summary="@string/summary_checkbox_multi_controller"
+            android:defaultValue="true" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings">
         <CheckBoxPreference
             android:key="checkbox_enable_sops"

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.0.1'
     }
 }
 

limelight-android.iml

@@ -7,9 +7,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />