Bump version to 4.8.4

Update gradle
Fix keyboard arrow keys being sent as gamepad d-pad events
2017-05-11 23:20:43 -07:00 · 2017-05-04 23:02:17 -07:00 · 2017-05-04 23:00:47 -07:00 · 2017-05-04 22:41:09 -07:00 · 2017-05-04 22:33:42 -07:00 · 2017-05-04 22:30:53 -07:00
109 changed files with 4126 additions and 1046 deletions
@@ -32,4 +32,5 @@ Thumbs.db
 build/

 # Compiled JNI libraries folder
-**/jniLibs
+**/jniLibs
+app/.externalNativeBuild/
@@ -0,0 +1,3 @@
+[submodule "app/src/main/jni/jnienet/enet"]
+	path = app/src/main/jni/jnienet/enet
+	url = https://github.com/cgutman/enet.git
@@ -20,7 +20,7 @@ function p_h264raw.dissector(buf, pkt, root)

 	local i = 0
 	local data_start = -1
-    while i < buf:len do
+    while i < buf:len() do
 		-- Make sure we have a potential start sequence and type
        if buf:len() - i < 5 then
            -- We need more data
@@ -8,7 +8,7 @@ whether in your own home or over the internet.

 [Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/moonlight-stream/moonlight-ios) and [Windows and Windows Phone](https://github.com/moonlight-stream/moonlight-windows) are also in development.

-Check our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki) for more detailed information or a troubleshooting guide. 
+Check our [wiki](https://github.com/moonlight-stream/moonlight-docs/wiki) for more detailed information or a troubleshooting guide. 

 ##Features

@@ -46,6 +46,12 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 2. Write code
 3. Send Pull Requests

+##Building
+* Install Android Studio and the Android NDK
+* Run ‘git submodule update --init --recursive’ from within moonlight-android/
+* In moonlight-android/, create a file called ‘local.properties’. Add an ‘ndk.dir=’ property to the local.properties file and set it equal to your NDK directory.
+* Build the APK using Android Studio
+
 ##Authors

 * [Cameron Gutman](https://github.com/cgutman)  
@@ -12,10 +12,7 @@
        <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="assembleNonRootDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNonRootDebugAndroidTestSources" />
        <afterSyncTasks>
-          <task>generateNonRootDebugAndroidTestSources</task>
          <task>generateNonRootDebugSources</task>
        </afterSyncTasks>
        <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -25,16 +22,26 @@
        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
      </configuration>
    </facet>
+    <facet type="native-android-gradle" name="Native-Android-Gradle">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
+      </configuration>
+    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
    <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/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$/src/main/jni/jnienet/enet" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/jnienet" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/evdev_reader" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/nv_opus_dec" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/nonRoot/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/nonRoot/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/nonRoot/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/nonRoot/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/nonRoot/debug" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/nonRoot/debug" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/res" type="java-resource" />
@@ -42,71 +49,97 @@
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/nonRoot/debug" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndkBuild" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.52" level="project" />
    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.52" level="project" />
@@ -4,27 +4,37 @@ import org.apache.tools.ant.taskdefs.condition.Os
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'

    defaultConfig {
        minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 25

-        versionName "4.0.4"
-        versionCode = 82
+        versionName "4.8.4"
+        versionCode = 116
    }

    productFlavors {
        root {
            applicationId "com.limelight.root"
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            }
        }

        nonRoot {
            applicationId "com.limelight"
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            }
        }
    }

+    lintOptions {
+        disable 'MissingTranslation'
+    }
+
    buildTypes {
        release {
            minifyEnabled false
@@ -32,42 +42,25 @@ android {
        }
    }

-    sourceSets.main.jni.srcDirs = []
-
-    //noinspection GroovyAssignabilityCheck,GroovyAssignabilityCheck
-    task ndkBuild(type: Exec, description: 'Compile JNI source via NDK') {
-        Properties properties = new Properties()
-        properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        def ndkDir = properties.getProperty('ndk.dir')
-
-        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            commandLine "$ndkDir\\ndk-build.cmd",
-                    'NDK_PROJECT_PATH=build/intermediates/ndk',
-                    'NDK_LIBS_OUT=src/main/jniLibs',
-                    'APP_BUILD_SCRIPT=src/main/jni/Android.mk',
-                    'NDK_APPLICATION_MK=src/main/jni/Application.mk'
-        }
-        else {
-            commandLine "$ndkDir/ndk-build",
-                    'NDK_PROJECT_PATH=build/intermediates/ndk',
-                    'NDK_LIBS_OUT=src/main/jniLibs',
-                    'APP_BUILD_SCRIPT=src/main/jni/Android.mk',
-                    'NDK_APPLICATION_MK=src/main/jni/Application.mk'
-        }
+    // These lines are required to avoid dexing issues with the BouncyCastle library
+    // bundled with limelight-common.jar
+    packagingOptions {
+        exclude 'META-INF/BCKEY.SF'
+        exclude 'META-INF/BCKEY.DSA'
    }

-    tasks.withType(JavaCompile) {
-        compileTask -> compileTask.dependsOn ndkBuild
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/jni/Android.mk"
+        }
    }
 }

 dependencies {
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.52'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.52'
-
-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.4.0'
-    compile group: 'com.squareup.okio', name:'okio', version:'1.5.0'
-
+    compile 'org.bouncycastle:bcprov-jdk15on:1.52'
+    compile 'org.bouncycastle:bcpkix-jdk15on:1.52'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.squareup.okio:okio:1.5.0'
    compile files('libs/jmdns-3.4.2.jar')
    compile files('libs/limelight-common.jar')
    compile files('libs/tinyrtsp.jar')
@@ -7,71 +7,87 @@
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.hardware.wifi" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false" />
-    <uses-feature android:name="android.hardware.usb.host" android:required="false" />
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.gamepad"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.usb.host"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />

    <application
        android:allowBackup="true"
+        android:isGame="true"
+        android:banner="@drawable/atv_banner"
        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">

        <!-- Samsung multi-window support -->
-        <uses-library android:name="com.sec.android.app.multiwindow" android:required="false" />
-        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-        
-        <!-- Launcher for traditional devices -->
+        <uses-library
+            android:name="com.sec.android.app.multiwindow"
+            android:required="false" />
+
+        <meta-data
+            android:name="com.sec.android.support.multiwindow"
+            android:value="true" />
+
        <activity
            android:name=".PcView"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
+            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
+
                <category android:name="android.intent.category.LAUNCHER" />
                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                <category android:name="tv.ouya.intent.category.APP" />
            </intent-filter>
        </activity>
-        
-        <!-- Launcher for Android TV devices -->
+        <!-- Small hack to support launcher shortcuts without relaunching over and over again when the back button is pressed -->
        <activity
-            android:name=".PcViewTv"
-            android:logo="@drawable/atv_banner"
-            android:icon="@drawable/atv_banner"
+            android:name=".AppViewShortcutTrampoline"
+            android:noHistory="true"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.limelight.PcView" />
        </activity>
-        
        <activity
            android:name=".AppView"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
+            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.PcView" />
        </activity>
        <activity
            android:name=".preferences.StreamSettings"
-            android:label="Streaming Settings" >
+            android:label="Streaming Settings">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.PcView" />
        </activity>
        <activity
            android:name=".preferences.AddComputerManually"
-            android:label="Add Computer Manually" >
+            android:label="Add Computer Manually">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.PcView" />
        </activity>
        <activity
            android:name=".Game"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
            android:screenOrientation="sensorLandscape"
-            android:theme="@style/StreamTheme"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
+            android:noHistory="true"
+            android:theme="@style/StreamTheme">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.AppView" />
@@ -86,6 +102,14 @@
        <service
            android:name=".binding.input.driver.UsbDriverService"
            android:label="Usb Driver Service" />
+
+        <activity
+            android:name=".HelpActivity"
+            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.limelight.PcView" />
+        </activity>
    </application>

-</manifest>
+</manifest>
@@ -11,12 +11,14 @@ import com.limelight.grid.AppGridAdapter;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.http.PairingManager;
 import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.CacheHelper;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.ServerHelper;
+import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;

@@ -43,6 +45,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 public class AppView extends Activity implements AdapterFragmentCallbacks {
    private AppGridAdapter appGridAdapter;
    private String uuidString;
+    private ShortcutHelper shortcutHelper;

    private ComputerDetails computer;
    private ComputerManagerService.ApplistPoller poller;
@@ -50,6 +53,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    private String lastRawApplist;
    private int lastRunningAppId;
    private boolean suspendGridUpdates;
+    private boolean inForeground;

    private final static int START_OR_RESUME_ID = 1;
    private final static int QUIT_ID = 2;
@@ -89,15 +93,34 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                        return;
                    }

+                    // Load the app grid with cached data (if possible).
+                    // This must be done _before_ startComputerUpdates()
+                    // so the initial serverinfo response can update the running
+                    // icon.
+                    populateAppGridWithCache();
+
                    // Start updates
                    startComputerUpdates();

-                    // Load the app grid with cached data (if possible)
-                    populateAppGridWithCache();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isFinishing() || isChangingConfigurations()) {
+                                return;
+                            }

-                    getFragmentManager().beginTransaction()
-                            .replace(R.id.appFragmentContainer, new AdapterFragment())
-                            .commitAllowingStateLoss();
+                            // Despite my best efforts to catch all conditions that could
+                            // cause the activity to be destroyed when we try to commit
+                            // I haven't been able to, so we have this try-catch block.
+                            try {
+                                getFragmentManager().beginTransaction()
+                                        .replace(R.id.appFragmentContainer, new AdapterFragment())
+                                        .commitAllowingStateLoss();
+                            } catch (IllegalStateException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    });
                }
            }.start();
        }
@@ -108,13 +131,14 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    };

    private void startComputerUpdates() {
-        if (managerBinder == null) {
+        // Don't start polling if we're not bound or in the foreground
+        if (managerBinder == null || !inForeground) {
            return;
        }

        managerBinder.startPolling(new ComputerManagerListener() {
            @Override
-            public void notifyComputerUpdated(ComputerDetails details) {
+            public void notifyComputerUpdated(final ComputerDetails details) {
                // Do nothing if updates are suspended
                if (suspendGridUpdates) {
                    return;
@@ -139,6 +163,24 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                    return;
                }

+                // Close immediately if the PC is no longer paired
+                if (details.state == ComputerDetails.State.ONLINE && details.pairState != PairingManager.PairState.PAIRED) {
+                    AppView.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            // Disable shortcuts referencing this PC for now
+                            shortcutHelper.disableShortcut(details.uuid.toString(),
+                                    getResources().getString(R.string.scut_not_paired));
+
+                            // Display a toast to the user and quit the activity
+                            Toast.makeText(AppView.this, getResources().getText(R.string.scut_not_paired), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                    return;
+                }
+
                // App list is the same or empty
                if (details.rawAppList == null || details.rawAppList.equals(lastRawApplist)) {

@@ -157,6 +199,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

                try {
                    updateUiWithAppList(NvHTTP.getAppListByReader(new StringReader(details.rawAppList)));
+                    updateUiWithServerinfo(details);

                    if (blockingLoadSpinner != null) {
                        blockingLoadSpinner.dismiss();
@@ -190,12 +233,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
+        shortcutHelper = new ShortcutHelper(this);
+
+        UiHelper.setLocale(this);

        setContentView(R.layout.activity_app_view);

@@ -203,11 +243,17 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

        uuidString = getIntent().getStringExtra(UUID_EXTRA);

-        String labelText = getResources().getString(R.string.title_applist)+" "+getIntent().getStringExtra(NAME_EXTRA);
+        String computerName = getIntent().getStringExtra(NAME_EXTRA);
+
+        String labelText = getResources().getString(R.string.title_applist)+" "+computerName;
        TextView label = (TextView) findViewById(R.id.appListText);
        setTitle(labelText);
        label.setText(labelText);

+        // Add a launcher shortcut for this PC (forced, since this is user interaction)
+        shortcutHelper.createAppViewShortcut(uuidString, computerName, uuidString, true);
+        shortcutHelper.reportShortcutUsed(uuidString);
+
        // Bind to the computer manager service
        bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
                Service.BIND_AUTO_CREATE);
@@ -252,6 +298,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    protected void onResume() {
        super.onResume();

+        inForeground = true;
        startComputerUpdates();
    }

@@ -259,30 +306,18 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    protected void onPause() {
        super.onPause();

+        inForeground = false;
        stopComputerUpdates();
    }

-    private int getRunningAppId() {
-        int runningAppId = -1;
-        for (int i = 0; i < appGridAdapter.getCount(); i++) {
-            AppObject app = (AppObject) appGridAdapter.getItem(i);
-            if (app.app.getIsRunning()) {
-                runningAppId = app.app.getAppId();
-                break;
-            }
-        }
-        return runningAppId;
-    }
-
    @Override
    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
        super.onCreateContextMenu(menu, v, menuInfo);
        
        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
        AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
-        int runningAppId = getRunningAppId();
-        if (runningAppId != -1) {
-            if (runningAppId == selectedApp.app.getAppId()) {
+        if (lastRunningAppId != 0) {
+            if (lastRunningAppId == selectedApp.app.getAppId()) {
                menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
            }
@@ -358,19 +393,19 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                    AppObject existingApp = (AppObject) appGridAdapter.getItem(i);

                    // There can only be one or zero apps running.
-                    if (existingApp.app.getIsRunning() &&
+                    if (existingApp.isRunning &&
                            existingApp.app.getAppId() == details.runningGameId) {
                        // This app was running and still is, so we're done now
                        return;
                    }
                    else if (existingApp.app.getAppId() == details.runningGameId) {
                        // This app wasn't running but now is
-                        existingApp.app.setIsRunning(true);
+                        existingApp.isRunning = true;
                        updated = true;
                    }
-                    else if (existingApp.app.getIsRunning()) {
+                    else if (existingApp.isRunning) {
                        // This app was running but now isn't
-                        existingApp.app.setIsRunning(false);
+                        existingApp.isRunning = false;
                        updated = true;
                    }
                    else {
@@ -400,10 +435,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                        AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
                        if (existingApp.app.getAppId() == app.getAppId()) {
                            // Found the app; update its properties
-                            if (existingApp.app.getIsRunning() != app.getIsRunning()) {
-                                existingApp.app.setIsRunning(app.getIsRunning());
-                                updated = true;
-                            }
                            if (!existingApp.app.getAppName().equals(app.getAppName())) {
                                existingApp.app.setAppName(app.getAppName());
                                updated = true;
@@ -473,7 +504,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                AppObject app = (AppObject) appGridAdapter.getItem(pos);

                // Only open the context menu if something is running, otherwise start it
-                if (getRunningAppId() != -1) {
+                if (lastRunningAppId != 0) {
                    openContextMenu(arg1);
                } else {
                    ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
@@ -486,6 +517,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

    public class AppObject {
        public final NvApp app;
+        public boolean isRunning;

        public AppObject(NvApp app) {
            if (app == null) {
@@ -0,0 +1,164 @@
+package com.limelight;
+
+import android.app.Activity;
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+
+import com.limelight.computers.ComputerManagerListener;
+import com.limelight.computers.ComputerManagerService;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
+import com.limelight.utils.Dialog;
+import com.limelight.utils.ServerHelper;
+import com.limelight.utils.SpinnerDialog;
+import com.limelight.utils.UiHelper;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+public class AppViewShortcutTrampoline extends Activity {
+    private String uuidString;
+
+    private ComputerDetails computer;
+    private SpinnerDialog blockingLoadSpinner;
+
+    public final static String UUID_EXTRA = "UUID";
+
+    private ComputerManagerService.ComputerManagerBinder managerBinder;
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder binder) {
+            final ComputerManagerService.ComputerManagerBinder localBinder =
+                    ((ComputerManagerService.ComputerManagerBinder)binder);
+
+            // Wait in a separate thread to avoid stalling the UI
+            new Thread() {
+                @Override
+                public void run() {
+                    // Wait for the binder to be ready
+                    localBinder.waitForReady();
+
+                    // Now make the binder visible
+                    managerBinder = localBinder;
+
+                    // Get the computer object
+                    computer = managerBinder.getComputer(UUID.fromString(uuidString));
+
+                    // Force CMS to repoll this machine
+                    managerBinder.invalidateStateForComputer(computer.uuid);
+
+                    // Start polling
+                    managerBinder.startPolling(new ComputerManagerListener() {
+                        @Override
+                        public void notifyComputerUpdated(final ComputerDetails details) {
+                            // Don't care about other computers
+                            if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
+                                return;
+                            }
+
+                            if (details.state != ComputerDetails.State.UNKNOWN) {
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        // Stop showing the spinner
+                                        if (blockingLoadSpinner != null) {
+                                            blockingLoadSpinner.dismiss();
+                                            blockingLoadSpinner = null;
+                                        }
+
+                                        if (details.state == ComputerDetails.State.ONLINE) {
+                                            // Close this activity
+                                            finish();
+
+                                            // Create a new activity stack for this launch
+                                            ArrayList<Intent> intentStack = new ArrayList<>();
+                                            Intent i;
+
+                                            // Add the PC view at the back (and clear the task)
+                                            i = new Intent(AppViewShortcutTrampoline.this, PcView.class);
+                                            i.setAction(Intent.ACTION_MAIN);
+                                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+                                            intentStack.add(i);
+
+                                            // Take this intent's data and create an intent to start the app view
+                                            i = new Intent(getIntent());
+                                            i.setClass(AppViewShortcutTrampoline.this, AppView.class);
+                                            intentStack.add(i);
+
+                                            // If a game is running, we'll make the stream the top level activity
+                                            if (details.runningGameId != 0) {
+                                                intentStack.add(ServerHelper.createStartIntent(AppViewShortcutTrampoline.this,
+                                                        new NvApp("app", details.runningGameId), details, managerBinder));
+                                            }
+
+                                            // Now start the activities
+                                            startActivities(intentStack.toArray(new Intent[]{}));
+                                        }
+                                        else if (details.state == ComputerDetails.State.OFFLINE) {
+                                            // Computer offline - display an error dialog
+                                            Dialog.displayDialog(AppViewShortcutTrampoline.this,
+                                                    getResources().getString(R.string.conn_error_title),
+                                                    getResources().getString(R.string.error_pc_offline),
+                                                    true);
+                                        }
+
+                                        // We don't want any more callbacks from now on, so go ahead
+                                        // and unbind from the service
+                                        if (managerBinder != null) {
+                                            managerBinder.stopPolling();
+                                            unbindService(serviceConnection);
+                                            managerBinder = null;
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }.start();
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            managerBinder = null;
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        UiHelper.notifyNewRootView(this);
+
+        uuidString = getIntent().getStringExtra(UUID_EXTRA);
+
+        // Bind to the computer manager service
+        bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
+                Service.BIND_AUTO_CREATE);
+
+        blockingLoadSpinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.conn_establishing_title),
+                getResources().getString(R.string.applist_connect_msg), true);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if (blockingLoadSpinner != null) {
+            blockingLoadSpinner.dismiss();
+            blockingLoadSpinner = null;
+        }
+
+        Dialog.closeDialogs();
+
+        if (managerBinder != null) {
+            managerBinder.stopPolling();
+            unbindService(serviceConnection);
+            managerBinder = null;
+        }
+
+        finish();
+    }
+}
@@ -4,9 +4,10 @@ package com.limelight;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.binding.input.ControllerHandler;
 import com.limelight.binding.input.KeyboardTranslator;
+import com.limelight.binding.input.capture.InputCaptureManager;
+import com.limelight.binding.input.capture.InputCaptureProvider;
 import com.limelight.binding.input.TouchContext;
 import com.limelight.binding.input.driver.UsbDriverService;
-import com.limelight.binding.input.evdev.EvdevHandler;
 import com.limelight.binding.input.evdev.EvdevListener;
 import com.limelight.binding.input.virtual_controller.VirtualController;
 import com.limelight.binding.video.EnhancedDecoderRenderer;
@@ -21,8 +22,11 @@ import com.limelight.nvstream.input.KeyboardPacket;
 import com.limelight.nvstream.input.MouseButtonPacket;
 import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.GameGestures;
+import com.limelight.ui.StreamView;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.SpinnerDialog;
+import com.limelight.utils.UiHelper;

 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -37,6 +41,7 @@ import android.hardware.input.InputManager;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -46,12 +51,10 @@ import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.View.OnGenericMotionListener;
 import android.view.View.OnSystemUiVisibilityChangeListener;
 import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
@@ -73,8 +76,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    private final TouchContext[] touchContextMap = new TouchContext[2];
    private long threeFingerDownTime = 0;

-    private static final double REFERENCE_HORIZ_RES = 1280;
-    private static final double REFERENCE_VERT_RES = 720;
+    private static final int REFERENCE_HORIZ_RES = 1280;
+    private static final int REFERENCE_VERT_RES = 720;

    private static final int THREE_FINGER_TAP_THRESHOLD = 300;

@@ -83,19 +86,20 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    private KeyboardTranslator keybTranslator;

    private PreferenceConfiguration prefConfig;
-    private final Point screenSize = new Point(0, 0);

    private NvConnection conn;
    private SpinnerDialog spinner;
    private boolean displayedFailureDialog = false;
    private boolean connecting = false;
    private boolean connected = false;
-    private boolean deferredSurfaceResize = false;

-    private EvdevHandler evdevHandler;
+    private InputCaptureProvider inputCaptureProvider;
    private int modifierFlags = 0;
    private boolean grabbedInput = true;
    private boolean grabComboDown = false;
+    private StreamView streamView;
+
+    private ShortcutHelper shortcutHelper;

    private EnhancedDecoderRenderer decoderRenderer;

@@ -123,17 +127,16 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    public static final String EXTRA_APP_ID = "AppId";
    public static final String EXTRA_UNIQUEID = "UniqueId";
    public static final String EXTRA_STREAMING_REMOTE = "Remote";
+    public static final String EXTRA_PC_UUID = "UUID";
+    public static final String EXTRA_PC_NAME = "PcName";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
+        shortcutHelper = new ShortcutHelper(this);
+
+        UiHelper.setLocale(this);

        // We don't want a title bar
        requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -174,19 +177,16 @@ public class Game extends Activity implements SurfaceHolder.Callback,
            drFlags |= VideoDecoderRenderer.FLAG_FILL_SCREEN;
        }

-        Display display = getWindowManager().getDefaultDisplay();
-        display.getSize(screenSize);
-
        // Listen for events on the game surface
-        SurfaceView sv = (SurfaceView) findViewById(R.id.surfaceView);
-        sv.setOnGenericMotionListener(this);
-        sv.setOnTouchListener(this);
+        streamView = (StreamView) findViewById(R.id.surfaceView);
+        streamView.setOnGenericMotionListener(this);
+        streamView.setOnTouchListener(this);

        // Warn the user if they're on a metered connection
        checkDataConnection();

        // Make sure Wi-Fi is fully powered up
-        WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        WifiManager wifiMgr = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
        wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Limelight");
        wifiLock.setReferenceCounted(false);
        wifiLock.acquire();
@@ -196,12 +196,18 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        int appId = Game.this.getIntent().getIntExtra(EXTRA_APP_ID, StreamConfiguration.INVALID_APP_ID);
        String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
        boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
+        String uuid = Game.this.getIntent().getStringExtra(EXTRA_PC_UUID);
+        String pcName = Game.this.getIntent().getStringExtra(EXTRA_PC_NAME);

        if (appId == StreamConfiguration.INVALID_APP_ID) {
            finish();
            return;
        }

+        // Add a launcher shortcut for this PC (forced, since this is user interaction)
+        shortcutHelper.createAppViewShortcut(uuid, pcName, uuid, true);
+        shortcutHelper.reportShortcutUsed(uuid);
+
        // Initialize the MediaCodec helper before creating the decoder
        MediaCodecHelper.initializeWithContext(this);

@@ -244,49 +250,29 @@ 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.multiController, prefConfig.deadzonePercentage);
+        controllerHandler = new ControllerHandler(this, conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);

        InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
        inputManager.registerInputDeviceListener(controllerHandler, null);

-        boolean aspectRatioMatch = false;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-            // On KitKat and later (where we can use the whole screen via immersive mode), we'll
-            // calculate whether we need to scale by aspect ratio or not. If not, we'll use
-            // setFixedSize so we can handle 4K properly. The only known devices that have
-            // >= 4K screens have exactly 4K screens, so we'll be able to hit this good path
-            // on these devices. On Marshmallow, we can start changing to 4K manually but no
-            // 4K devices run 6.0 at the moment.
-            double screenAspectRatio = ((double)screenSize.y) / screenSize.x;
-            double streamAspectRatio = ((double)prefConfig.height) / prefConfig.width;
-            if (Math.abs(screenAspectRatio - streamAspectRatio) < 0.001) {
-                LimeLog.info("Stream has compatible aspect ratio with output display");
-                aspectRatioMatch = true;
-            }
-        }
-
-        SurfaceHolder sh = sv.getHolder();
-        if (prefConfig.stretchVideo || aspectRatioMatch) {
-            // Set the surface to the size of the video
-            sh.setFixedSize(prefConfig.width, prefConfig.height);
-        }
-        else {
-            deferredSurfaceResize = true;
-        }
+        // Set to the optimal mode for streaming
+        prepareDisplayForRendering();

        // Initialize touch contexts
        for (int i = 0; i < touchContextMap.length; i++) {
            touchContextMap[i] = new TouchContext(conn, i,
-                    (REFERENCE_HORIZ_RES / (double)screenSize.x),
-                    (REFERENCE_VERT_RES / (double)screenSize.y));
+                    REFERENCE_HORIZ_RES, REFERENCE_VERT_RES,
+                    streamView);
        }

-        if (LimelightBuildProps.ROOT_BUILD) {
-            // Start watching for raw input
-            evdevHandler = new EvdevHandler(this, this);
-            evdevHandler.start();
+        // Use sustained performance mode on N+ to ensure consistent
+        // CPU availability
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            getWindow().setSustainedPerformanceMode(true);
        }

+        inputCaptureProvider = InputCaptureManager.getInputCaptureProvider(this, this);
+
        if (prefConfig.onscreenController) {
            // create virtual onscreen controller
            virtualController = new VirtualController(conn,
@@ -302,26 +288,95 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        }

        // The connection will be started when the surface gets created
-        sh.addCallback(this);
+        streamView.getHolder().addCallback(this);
    }

-    private void resizeSurfaceWithAspectRatio(SurfaceView sv, double vidWidth, double vidHeight)
-    {
-        // Get the visible width of the activity
-        double visibleWidth = getWindow().getDecorView().getWidth();
+    private void prepareDisplayForRendering() {
+        Display display = getWindowManager().getDefaultDisplay();
+        WindowManager.LayoutParams windowLayoutParams = getWindow().getAttributes();

-        ViewGroup.LayoutParams lp = sv.getLayoutParams();
+        // On M, we can explicitly set the optimal display mode
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Display.Mode bestMode = display.getMode();
+            for (Display.Mode candidate : display.getSupportedModes()) {
+                boolean refreshRateOk = candidate.getRefreshRate() >= bestMode.getRefreshRate() &&
+                        candidate.getRefreshRate() < 63;
+                boolean resolutionOk = candidate.getPhysicalWidth() >= bestMode.getPhysicalWidth() &&
+                        candidate.getPhysicalHeight() >= bestMode.getPhysicalHeight() &&
+                        candidate.getPhysicalWidth() <= 4096;

-        // Calculate the new size of the SurfaceView
-        lp.width = (int) visibleWidth;
-        lp.height = (int) ((vidHeight / vidWidth) * visibleWidth);
+                LimeLog.info("Examining display mode: "+candidate.getPhysicalWidth()+"x"+
+                        candidate.getPhysicalHeight()+"x"+candidate.getRefreshRate());

-        // Apply the size change
-        sv.setLayoutParams(lp);
+                // On non-4K streams, we force the resolution to never change
+                if (prefConfig.width < 3840) {
+                    if (display.getMode().getPhysicalWidth() != candidate.getPhysicalWidth() ||
+                            display.getMode().getPhysicalHeight() != candidate.getPhysicalHeight()) {
+                        continue;
+                    }
+                }

-        // refresh virtual controller layout
-        if (virtualController != null) {
-            virtualController.refreshLayout();
+                // Make sure the refresh rate doesn't regress
+                if (!refreshRateOk) {
+                    continue;
+                }
+
+                // Make sure the resolution doesn't regress
+                if (!resolutionOk) {
+                    continue;
+                }
+
+                bestMode = candidate;
+            }
+            LimeLog.info("Selected display mode: "+bestMode.getPhysicalWidth()+"x"+
+                    bestMode.getPhysicalHeight()+"x"+bestMode.getRefreshRate());
+            windowLayoutParams.preferredDisplayModeId = bestMode.getModeId();
+        }
+        // On L, we can at least tell the OS that we want 60 Hz
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            float bestRefreshRate = display.getRefreshRate();
+            for (float candidate : display.getSupportedRefreshRates()) {
+                if (candidate > bestRefreshRate && candidate < 63) {
+                    LimeLog.info("Examining refresh rate: "+candidate);
+                    bestRefreshRate = candidate;
+                }
+            }
+            LimeLog.info("Selected refresh rate: "+bestRefreshRate);
+            windowLayoutParams.preferredRefreshRate = bestRefreshRate;
+        }
+
+        // Apply the display mode change
+        getWindow().setAttributes(windowLayoutParams);
+
+        // From 4.4 to 5.1 we can't ask for a 4K display mode, so we'll
+        // need to hint the OS to provide one.
+        boolean aspectRatioMatch = false;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT &&
+                Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            // On KitKat and later (where we can use the whole screen via immersive mode), we'll
+            // calculate whether we need to scale by aspect ratio or not. If not, we'll use
+            // setFixedSize so we can handle 4K properly. The only known devices that have
+            // >= 4K screens have exactly 4K screens, so we'll be able to hit this good path
+            // on these devices. On Marshmallow, we can start changing to 4K manually but no
+            // 4K devices run 6.0 at the moment.
+            Point screenSize = new Point(0, 0);
+            display.getSize(screenSize);
+
+            double screenAspectRatio = ((double)screenSize.y) / screenSize.x;
+            double streamAspectRatio = ((double)prefConfig.height) / prefConfig.width;
+            if (Math.abs(screenAspectRatio - streamAspectRatio) < 0.001) {
+                LimeLog.info("Stream has compatible aspect ratio with output display");
+                aspectRatioMatch = true;
+            }
+        }
+
+        if (prefConfig.stretchVideo || aspectRatioMatch) {
+            // Set the surface to the size of the video
+            streamView.getHolder().setFixedSize(prefConfig.width, prefConfig.height);
+        }
+        else {
+            // Set the surface to scale based on the aspect ratio of the stream
+            streamView.setDesiredAspectRatio((double)prefConfig.width / (double)prefConfig.height);
        }
    }

@@ -422,13 +477,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    private final Runnable toggleGrab = new Runnable() {
        @Override
        public void run() {
-            if (evdevHandler != null) {
-                if (grabbedInput) {
-                    evdevHandler.ungrabAll();
-                }
-                else {
-                    evdevHandler.regrabAll();
-                }
+            if (grabbedInput) {
+                inputCaptureProvider.disableCapture();
+            }
+            else {
+                inputCaptureProvider.enableCapture();
            }

            grabbedInput = !grabbedInput;
@@ -521,8 +574,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
            return super.onKeyDown(keyCode, event);
        }

-        // Try the controller handler first
-        boolean handled = controllerHandler.handleButtonDown(event);
+        boolean handled = false;
+        if (event.getDevice() == null ||
+                event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+            // Always try the controller handler first, unless it's an alphanumeric keyboard device.
+            // Otherwise, controller handler will eat keyboard d-pad events.
+            handled = controllerHandler.handleButtonDown(event);
+        }
+
        if (!handled) {
            // Try the keyboard handler
            short translated = keybTranslator.translate(event.getKeyCode());
@@ -535,11 +594,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                return true;
            }

-            // Eat repeat down events
-            if (event.getRepeatCount() > 0) {
-                return true;
-            }
-
            // Pass through keyboard input if we're not grabbing
            if (!grabbedInput) {
                return super.onKeyDown(keyCode, event);
@@ -559,8 +613,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
            return super.onKeyUp(keyCode, event);
        }

-        // Try the controller handler first
-        boolean handled = controllerHandler.handleButtonUp(event);
+        boolean handled = false;
+        if (event.getDevice() == null ||
+                event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+            // Always try the controller handler first, unless it's an alphanumeric keyboard device.
+            // Otherwise, controller handler will eat keyboard d-pad events.
+            handled = controllerHandler.handleButtonUp(event);
+        }
+
        if (!handled) {
            // Try the keyboard handler
            short translated = keybTranslator.translate(event.getKeyCode());
@@ -616,7 +676,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0)
        {
            // This case is for mice
-            if (event.getSource() == InputDevice.SOURCE_MOUSE)
+            if (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                    (event.getPointerCount() >= 1 &&
+                            event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE))
            {
                int changedButtons = event.getButtonState() ^ lastButtonState;

@@ -653,19 +715,38 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                    }
                }

-                // First process the history
-                for (int i = 0; i < event.getHistorySize(); i++) {
-                    updateMousePosition((int)event.getHistoricalX(i), (int)event.getHistoricalY(i));
-                }
+                // Get relative axis values if we can
+                if (inputCaptureProvider.eventHasRelativeMouseAxes(event)) {
+                    // Send the deltas straight from the motion event
+                    conn.sendMouseMove((short) inputCaptureProvider.getRelativeAxisX(event),
+                            (short) inputCaptureProvider.getRelativeAxisY(event));

-                // Now process the current values
-                updateMousePosition((int)event.getX(), (int)event.getY());
+                    // We have to also update the position Android thinks the cursor is at
+                    // in order to avoid jumping when we stop moving or click.
+                    lastMouseX = (int)event.getX();
+                    lastMouseY = (int)event.getY();
+                }
+                else {
+                    // First process the history
+                    for (int i = 0; i < event.getHistorySize(); i++) {
+                        updateMousePosition((int)event.getHistoricalX(i), (int)event.getHistoricalY(i));
+                    }
+
+                    // Now process the current values
+                    updateMousePosition((int)event.getX(), (int)event.getY());
+                }

                lastButtonState = event.getButtonState();
            }
            // 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);
@@ -776,8 +857,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,

            // Scale the deltas if the device resolution is different
            // than the stream resolution
-            deltaX = (int)Math.round((double)deltaX * (REFERENCE_HORIZ_RES / (double)screenSize.x));
-            deltaY = (int)Math.round((double)deltaY * (REFERENCE_VERT_RES / (double)screenSize.y));
+            deltaX = (int)Math.round((double)deltaX * (REFERENCE_HORIZ_RES / (double)streamView.getWidth()));
+            deltaY = (int)Math.round((double)deltaY * (REFERENCE_VERT_RES / (double)streamView.getHeight()));

            conn.sendMouseMove((short)deltaX, (short)deltaY);
        }
@@ -815,11 +896,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
            conn.stop();
        }

-        // Close the Evdev reader to allow use of captured input devices
-        if (evdevHandler != null) {
-            evdevHandler.stop();
-            evdevHandler = null;
-        }
+        // Enable cursor visibility again
+        inputCaptureProvider.disableCapture();
+
+        // Destroy the capture provider
+        inputCaptureProvider.destroy();
    }

    @Override
@@ -859,6 +940,16 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        connecting = false;
        connected = true;

+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                // Hide the mouse cursor now. Doing it before
+                // dismissing the spinner seems to be undone
+                // when the spinner gets displayed.
+                inputCaptureProvider.enableCapture();
+            }
+        });
+
        hideSystemUi(1000);
    }

@@ -893,13 +984,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        if (!connected && !connecting) {
            connecting = true;

-            // Resize the surface to match the aspect ratio of the video
-            // This must be done after the surface is created.
-            if (deferredSurfaceResize) {
-                resizeSurfaceWithAspectRatio((SurfaceView) findViewById(R.id.surfaceView),
-                        prefConfig.width, prefConfig.height);
-            }
-
            conn.start(PlatformBinding.getDeviceName(), holder, drFlags,
                    PlatformBinding.getAudioRenderer(), decoderRenderer);
        }
@@ -908,6 +992,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    @Override
    public void surfaceDestroyed(SurfaceHolder holder) {
        if (connected) {
+            // HACK: Android is supposed to let you return from this function
+            // before throwing a fit if you access the surface again. Unfortunately,
+            // MediaCodec often tries to access the destroyed surface and triggers
+            // an IllegalStateException. To workaround this, we will invoke
+            // the DecoderRenderer's stop function ourselves, so it will hopefully
+            // happen early enough to not trigger the bug
+            decoderRenderer.stop();
+
            stopConnection();
        }
    }
@@ -0,0 +1,79 @@
+package com.limelight;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import com.limelight.utils.SpinnerDialog;
+
+public class HelpActivity extends Activity {
+
+    private SpinnerDialog loadingDialog;
+    private WebView webView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        webView = new WebView(this);
+        setContentView(webView);
+
+        // These allow the user to zoom the page
+        webView.getSettings().setBuiltInZoomControls(true);
+        webView.getSettings().setDisplayZoomControls(false);
+
+        // This sets the view to display the whole page by default
+        webView.getSettings().setUseWideViewPort(true);
+        webView.getSettings().setLoadWithOverviewMode(true);
+
+        // This allows the links to places on the same page to work
+        webView.getSettings().setJavaScriptEnabled(true);
+
+        webView.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                if (loadingDialog == null) {
+                    loadingDialog = SpinnerDialog.displayDialog(HelpActivity.this,
+                            getResources().getString(R.string.help_loading_title),
+                            getResources().getString(R.string.help_loading_msg), false);
+                }
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                if (loadingDialog != null) {
+                    loadingDialog.dismiss();
+                    loadingDialog = null;
+                }
+            }
+
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                if (url.toUpperCase().startsWith("https://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()) ||
+                        url.toUpperCase().startsWith("http://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase())) {
+                    // Allow navigation to Moonlight docs
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+        });
+
+        webView.loadUrl(getIntent().getData().toString());
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Back goes back through the WebView history
+        // until no more history remains
+        if (webView.canGoBack()) {
+            webView.goBack();
+        }
+        else {
+            super.onBackPressed();
+        }
+    }
+}
@@ -23,7 +23,9 @@ import com.limelight.preferences.StreamSettings;
 import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.HelpLauncher;
 import com.limelight.utils.ServerHelper;
+import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.UiHelper;

 import android.app.Activity;
@@ -52,8 +54,9 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 public class PcView extends Activity implements AdapterFragmentCallbacks {
    private RelativeLayout noPcFoundLayout;
    private PcGridAdapter pcGridAdapter;
+    private ShortcutHelper shortcutHelper;
    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private boolean freezeUpdates, runningPolling, hasResumed;
+    private boolean freezeUpdates, runningPolling, inForeground;
    private final ServiceConnection serviceConnection = new ServiceConnection() {
        public void onServiceConnected(ComponentName className, IBinder binder) {
            final ComputerManagerService.ComputerManagerBinder localBinder =
@@ -109,6 +112,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        // Setup the list view
        ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
        ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
+        ImageButton helpButton = (ImageButton) findViewById(R.id.helpButton);

        settingsButton.setOnClickListener(new OnClickListener() {
            @Override
@@ -123,6 +127,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                startActivity(i);
            }
        });
+        helpButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                HelpLauncher.launchSetupGuide(PcView.this);
+            }
+        });

        getFragmentManager().beginTransaction()
            .replace(R.id.pcFragmentContainer, new AdapterFragment())
@@ -142,12 +152,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
+        shortcutHelper = new ShortcutHelper(this);
+
+        UiHelper.setLocale(this);

        // Bind to the computer manager service
        bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
@@ -161,11 +168,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    }

    private void startComputerUpdates() {
-        if (managerBinder != null) {
-            if (runningPolling) {
-                return;
-            }
-
+        // Only allow polling to start if we're bound to CMS, polling is not already running,
+        // and our activity is in the foreground.
+        if (managerBinder != null && !runningPolling && inForeground) {
            freezeUpdates = false;
            managerBinder.startPolling(new ComputerManagerListener() {
                @Override
@@ -215,7 +220,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    protected void onResume() {
        super.onResume();

-        hasResumed = true;
+        inForeground = true;
        startComputerUpdates();
    }

@@ -223,7 +228,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    protected void onPause() {
        super.onPause();

-        hasResumed = false;
+        inForeground = false;
        stopComputerUpdates(false);
    }

@@ -271,10 +276,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    @Override
    public void onContextMenuClosed(Menu menu) {
        // For some reason, this gets called again _after_ onPause() is called on this activity.
-        // We don't want to start computer updates again, so we need to keep track of whether we're paused.
-        if (hasResumed) {
-            startComputerUpdates();
-        }
+        // startComputerUpdates() manages this and won't actual start polling until the activity
+        // returns to the foreground.
+        startComputerUpdates();
    }

    private void doPair(final ComputerDetails computer) {
@@ -302,7 +306,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                    // Stop updates and wait while pairing
                    stopComputerUpdates(true);

-                    InetAddress addr = null;
+                    InetAddress addr;
                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
                        addr = computer.localIp;
                    }
@@ -330,17 +334,24 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                        Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
                                getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);

-                        PairingManager.PairState pairState = httpConn.pair(pinStr);
+                        PairingManager.PairState pairState = httpConn.pair(httpConn.getServerInfo(), pinStr);
                        if (pairState == PairingManager.PairState.PIN_WRONG) {
                            message = getResources().getString(R.string.pair_incorrect_pin);
                        }
                        else if (pairState == PairingManager.PairState.FAILED) {
                            message = getResources().getString(R.string.pair_fail);
                        }
+                        else if (pairState == PairingManager.PairState.ALREADY_IN_PROGRESS) {
+                            message = getResources().getString(R.string.pair_already_in_progress);
+                        }
                        else if (pairState == PairingManager.PairState.PAIRED) {
                            // Just navigate to the app view without displaying a toast
                            message = null;
                            success = true;
+
+                            // Invalidate reachability information after pairing to force
+                            // a refresh before reading pair state again
+                            managerBinder.invalidateStateForComputer(computer.uuid);
                        }
                        else {
                            // Should be no other values
@@ -368,14 +379,15 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                        }

                        if (toastSuccess) {
-                            // Open the app list after a successful pairing attemp
+                            // Open the app list after a successful pairing attempt
                            doAppList(computer);
                        }
+                        else {
+                            // Start polling again if we're still in the foreground
+                            startComputerUpdates();
+                        }
                    }
                });
-
-                // Start polling again
-                startComputerUpdates();
            }
        }).start();
    }
@@ -431,7 +443,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                NvHTTP httpConn;
                String message;
                try {
-                    InetAddress addr = null;
+                    InetAddress addr;
                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
                        addr = computer.localIp;
                    }
@@ -560,6 +572,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
            ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);

            if (details.equals(computer.details)) {
+                // Disable or delete shortcuts referencing this PC
+                shortcutHelper.disableShortcut(details.uuid.toString(),
+                        getResources().getString(R.string.scut_deleted_pc));
+
                pcGridAdapter.removeComputer(computer);
                pcGridAdapter.notifyDataSetChanged();

@@ -586,6 +602,11 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
            }
        }

+        // Add a launcher shortcut for this PC
+        if (details.pairState == PairState.PAIRED) {
+            shortcutHelper.createAppViewShortcut(details.uuid.toString(), details, false);
+        }
+
        if (existingEntry != null) {
            // Replace the information in the existing entry
            existingEntry.details = details;
@@ -1,6 +0,0 @@
-package com.limelight;
-
-/* This is a dummy class to allow for a separate icon
- * and launcher for TV.
- */
-public class PcViewTv extends PcView {}
@@ -1,24 +1,31 @@
 package com.limelight.binding.input;

+import android.content.Context;
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
 import android.util.SparseArray;
 import android.view.InputDevice;
+import android.view.InputEvent;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.widget.Toast;

 import com.limelight.LimeLog;
 import com.limelight.binding.input.driver.UsbDriverListener;
 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.ControllerPacket;
+import com.limelight.nvstream.input.MouseButtonPacket;
 import com.limelight.ui.GameGestures;
 import com.limelight.utils.Vector2d;

+import java.util.Timer;
+import java.util.TimerTask;
+
 public class ControllerHandler implements InputManager.InputDeviceListener, UsbDriverListener {

    private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;

-    private static final int START_DOWN_TIME_KEYB_MS = 750;
+    private static final int START_DOWN_TIME_MOUSE_MODE_MS = 750;

    private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;

@@ -34,6 +41,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private final SparseArray<UsbDeviceContext> usbDeviceContexts = new SparseArray<>();

    private final NvConnection conn;
+    private final Context activityContext;
    private final double stickDeadzone;
    private final InputDeviceContext defaultContext = new InputDeviceContext();
    private final GameGestures gestures;
@@ -42,7 +50,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private final boolean multiControllerEnabled;
    private short currentControllers;

-    public ControllerHandler(NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
+    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
+        this.activityContext = activityContext;
        this.conn = conn;
        this.gestures = gestures;
        this.multiControllerEnabled = multiControllerEnabled;
@@ -82,6 +91,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
        defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
        defaultContext.controllerNumber = (short) 0;
+        defaultContext.assignedControllerNumber = true;
    }

    private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
@@ -122,7 +132,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private void releaseControllerNumber(GenericControllerContext context) {
        // If this device sent data as a gamepad, zero the values before removing
        if (context.assignedControllerNumber) {
-            conn.sendControllerInput(context.controllerNumber, (short) 0,
+            conn.sendControllerInput(context.controllerNumber, getActiveControllerMask(),
+                    (short) 0,
                    (byte) 0, (byte) 0,
                    (short) 0, (short) 0,
                    (short) 0, (short) 0);
@@ -146,8 +157,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            InputDeviceContext devContext = (InputDeviceContext) context;

            LimeLog.info(devContext.name+" ("+context.id+") needs a controller number assigned");
-            if (devContext.name != null && devContext.name.contains("gpio-keys")) {
-                // This is the back button on Shield portable consoles
+            if (devContext.name != null &&
+                    (devContext.name.contains("gpio-keys") || // This is the back button on Shield portable consoles
+                            devContext.name.contains("joy_key"))) { // These are the gamepad buttons on the Archos Gamepad 2
                LimeLog.info("Built-in buttons hardcoded as controller 0");
                context.controllerNumber = 0;
            }
@@ -212,6 +224,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        String devName = dev.getName();

        LimeLog.info("Creating controller context for device: "+devName);
+        LimeLog.info(dev.toString());

        context.name = devName;
        context.id = dev.getId();
@@ -229,6 +242,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        InputDevice.MotionRange rightTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RTRIGGER);
        InputDevice.MotionRange brakeRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_BRAKE);
        InputDevice.MotionRange gasRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_GAS);
+        InputDevice.MotionRange throttleRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_THROTTLE);
        if (leftTriggerRange != null && rightTriggerRange != null)
        {
            // Some controllers use LTRIGGER and RTRIGGER (like Ouya)
@@ -241,6 +255,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            context.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
            context.rightTriggerAxis = MotionEvent.AXIS_GAS;
        }
+        else if (brakeRange != null && throttleRange != null)
+        {
+            // Others use THROTTLE and BRAKE (like Xiaomi)
+            context.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+            context.rightTriggerAxis = MotionEvent.AXIS_THROTTLE;
+        }
        else
        {
            InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
@@ -320,12 +340,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            }
        }

-        // Ignore the back buttonn if a controller has both buttons
+        // The ADT-1 controller needs a similar fixup to the ASUS Gamepad
        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-            boolean[] hasSelectKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
-            if (hasSelectKey[0] && hasSelectKey[1]) {
-                LimeLog.info("Ignoring back button because select is present");
-                context.ignoreBack = true;
+            // The device name provided is just "Gamepad" which is pretty useless, so we
+            // use VID/PID instead
+            if (dev.getVendorId() == 0x18d1 && dev.getProductId() == 0x2c40) {
+                context.backIsStart = true;
+                context.modeIsSelect = true;
+                context.triggerDeadzone = 0.30f;
            }
        }

@@ -371,6 +393,17 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                context.isServal = true;
                context.ignoreBack = true;
            }
+            // The Xbox One S Bluetooth controller has some mappings that need fixing up.
+            // However, Microsoft released a firmware update with no change to VID/PID
+            // or device name that fixed the mappings for Android. Since there's
+            // no good way to detect this, we'll use the presence of GAS/BRAKE axes
+            // that were added in the latest firmware. If those are present, the only
+            // required fixup is ignoring the select button.
+            else if (devName.equals("Xbox Wireless Controller")) {
+                if (gasRange == null) {
+                    context.isXboxBtController = true;
+                }
+            }
        }

        LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
@@ -379,31 +412,152 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        return context;
    }

-    private InputDeviceContext getContextForDevice(InputDevice dev) {
+    private InputDeviceContext getContextForEvent(InputEvent event) {
        // Unknown devices use the default context
-        if (dev == null) {
+        if (event.getDeviceId() == 0) {
            return defaultContext;
        }
+        else if (event.getDevice() == null) {
+            // During device removal, sometimes we can get events after the
+            // input device has been destroyed. In this case we'll see a
+            // != 0 device ID but no device attached.
+            return null;
+        }

        // Return the existing context if it exists
-        InputDeviceContext context = inputDeviceContexts.get(dev.getId());
+        InputDeviceContext context = inputDeviceContexts.get(event.getDeviceId());
        if (context != null) {
            return context;
        }

        // Otherwise create a new context
-        context = createInputDeviceContextForDevice(dev);
-        inputDeviceContexts.put(dev.getId(), context);
+        context = createInputDeviceContextForDevice(event.getDevice());
+        inputDeviceContexts.put(event.getDeviceId(), context);

        return context;
    }

-    private void sendControllerInputPacket(GenericControllerContext context) {
-        assignControllerNumberIfNeeded(context);
-        conn.sendControllerInput(context.controllerNumber, context.inputMap,
-                context.leftTrigger, context.rightTrigger,
-                context.leftStickX, context.leftStickY,
-                context.rightStickX, context.rightStickY);
+    private byte maxByMagnitude(byte a, byte b) {
+        int absA = Math.abs(a);
+        int absB = Math.abs(b);
+        if (absA > absB) {
+            return a;
+        }
+        else {
+            return b;
+        }
+    }
+
+    private short maxByMagnitude(short a, short b) {
+        int absA = Math.abs(a);
+        int absB = Math.abs(b);
+        if (absA > absB) {
+            return a;
+        }
+        else {
+            return b;
+        }
+    }
+
+    private short getActiveControllerMask() {
+        if (multiControllerEnabled) {
+            return currentControllers;
+        }
+        else {
+            // Only Player 1 is active with multi-controller disabled
+            return 1;
+        }
+    }
+
+    private void sendControllerInputPacket(GenericControllerContext originalContext) {
+        assignControllerNumberIfNeeded(originalContext);
+
+        // Take the context's controller number and fuse all inputs with the same number
+        short controllerNumber = originalContext.controllerNumber;
+        short inputMap = 0;
+        byte leftTrigger = 0;
+        byte rightTrigger = 0;
+        short leftStickX = 0;
+        short leftStickY = 0;
+        short rightStickX = 0;
+        short rightStickY = 0;
+
+        // In order to properly handle controllers that are split into multiple devices,
+        // we must aggregate all controllers with the same controller number into a single
+        // device before we send it.
+        for (int i = 0; i < inputDeviceContexts.size(); i++) {
+            GenericControllerContext context = inputDeviceContexts.valueAt(i);
+            if (context.assignedControllerNumber &&
+                    context.controllerNumber == controllerNumber &&
+                    context.mouseEmulationActive == originalContext.mouseEmulationActive) {
+                inputMap |= context.inputMap;
+                leftTrigger |= maxByMagnitude(leftTrigger, context.leftTrigger);
+                rightTrigger |= maxByMagnitude(rightTrigger, context.rightTrigger);
+                leftStickX |= maxByMagnitude(leftStickX, context.leftStickX);
+                leftStickY |= maxByMagnitude(leftStickY, context.leftStickY);
+                rightStickX |= maxByMagnitude(rightStickX, context.rightStickX);
+                rightStickY |= maxByMagnitude(rightStickY, context.rightStickY);
+            }
+        }
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            GenericControllerContext context = usbDeviceContexts.valueAt(i);
+            if (context.assignedControllerNumber &&
+                    context.controllerNumber == controllerNumber &&
+                    context.mouseEmulationActive == originalContext.mouseEmulationActive) {
+                inputMap |= context.inputMap;
+                leftTrigger |= maxByMagnitude(leftTrigger, context.leftTrigger);
+                rightTrigger |= maxByMagnitude(rightTrigger, context.rightTrigger);
+                leftStickX |= maxByMagnitude(leftStickX, context.leftStickX);
+                leftStickY |= maxByMagnitude(leftStickY, context.leftStickY);
+                rightStickX |= maxByMagnitude(rightStickX, context.rightStickX);
+                rightStickY |= maxByMagnitude(rightStickY, context.rightStickY);
+            }
+        }
+        if (defaultContext.controllerNumber == controllerNumber) {
+            inputMap |= defaultContext.inputMap;
+            leftTrigger |= maxByMagnitude(leftTrigger, defaultContext.leftTrigger);
+            rightTrigger |= maxByMagnitude(rightTrigger, defaultContext.rightTrigger);
+            leftStickX |= maxByMagnitude(leftStickX, defaultContext.leftStickX);
+            leftStickY |= maxByMagnitude(leftStickY, defaultContext.leftStickY);
+            rightStickX |= maxByMagnitude(rightStickX, defaultContext.rightStickX);
+            rightStickY |= maxByMagnitude(rightStickY, defaultContext.rightStickY);
+        }
+
+        if (originalContext.mouseEmulationActive) {
+            int changedMask = inputMap ^  originalContext.mouseEmulationLastInputMap;
+
+            boolean aDown = (inputMap & ControllerPacket.A_FLAG) != 0;
+            boolean bDown = (inputMap & ControllerPacket.B_FLAG) != 0;
+
+            originalContext.mouseEmulationLastInputMap = inputMap;
+
+            if ((changedMask & ControllerPacket.A_FLAG) != 0) {
+                if (aDown) {
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+                }
+                else {
+                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                }
+            }
+            if ((changedMask & ControllerPacket.B_FLAG) != 0) {
+                if (bDown) {
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                }
+                else {
+                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+                }
+            }
+
+            conn.sendControllerInput(controllerNumber, getActiveControllerMask(),
+                    (short)0, (byte)0, (byte)0, (short)0, (short)0, (short)0, (short)0);
+        }
+        else {
+            conn.sendControllerInput(controllerNumber, getActiveControllerMask(),
+                    inputMap,
+                    leftTrigger, rightTrigger,
+                    leftStickX, leftStickY,
+                    rightStickX, rightStickY);
+        }
    }

    // Return a valid keycode, 0 to consume, or -1 to not consume the event
@@ -417,41 +571,38 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        if (context.isDualShock4) {
-            switch (event.getKeyCode()) {
-            case KeyEvent.KEYCODE_BUTTON_Y:
-                return KeyEvent.KEYCODE_BUTTON_L1;
-
-            case KeyEvent.KEYCODE_BUTTON_Z:
-                return KeyEvent.KEYCODE_BUTTON_R1;
-
-            case KeyEvent.KEYCODE_BUTTON_C:
-                return KeyEvent.KEYCODE_BUTTON_B;
-
-            case KeyEvent.KEYCODE_BUTTON_X:
-                return KeyEvent.KEYCODE_BUTTON_Y;
-
-            case KeyEvent.KEYCODE_BUTTON_B:
-                return KeyEvent.KEYCODE_BUTTON_A;
-
-            case KeyEvent.KEYCODE_BUTTON_A:
-                return KeyEvent.KEYCODE_BUTTON_X;
-
-            case KeyEvent.KEYCODE_BUTTON_SELECT:
-                return KeyEvent.KEYCODE_BUTTON_THUMBL;
-
-            case KeyEvent.KEYCODE_BUTTON_START:
-                return KeyEvent.KEYCODE_BUTTON_THUMBR;
-
-            case KeyEvent.KEYCODE_BUTTON_L2:
-                return KeyEvent.KEYCODE_BUTTON_SELECT;
-
-            case KeyEvent.KEYCODE_BUTTON_R2:
-                return KeyEvent.KEYCODE_BUTTON_START;
-
-            // These are duplicate trigger events
-            case KeyEvent.KEYCODE_BUTTON_R1:
-            case KeyEvent.KEYCODE_BUTTON_L1:
-                return 0;
+            switch (event.getScanCode()) {
+                case 304:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+                case 305:
+                    return KeyEvent.KEYCODE_BUTTON_A;
+                case 306:
+                    return KeyEvent.KEYCODE_BUTTON_B;
+                case 307:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 308:
+                    return KeyEvent.KEYCODE_BUTTON_L1;
+                case 309:
+                    return KeyEvent.KEYCODE_BUTTON_R1;
+                /*
+                **** Using analog triggers instead ****
+                case 310:
+                    return KeyEvent.KEYCODE_BUTTON_L2;
+                case 311:
+                    return KeyEvent.KEYCODE_BUTTON_R2;
+                */
+                case 312:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
+                case 313:
+                    return KeyEvent.KEYCODE_BUTTON_START;
+                case 314:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBL;
+                case 315:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBR;
+                case 316:
+                    return KeyEvent.KEYCODE_BUTTON_MODE;
+                default:
+                    return 0;
            }
        }
        // If this is a Serval controller sending an unknown key code, it's probably
@@ -464,6 +615,35 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                    return KeyEvent.KEYCODE_BUTTON_START;
            }
        }
+        else if (context.isXboxBtController) {
+            switch (event.getScanCode()) {
+                case 306:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+                case 307:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 308:
+                    return KeyEvent.KEYCODE_BUTTON_L1;
+                case 309:
+                    return KeyEvent.KEYCODE_BUTTON_R1;
+                case 310:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
+                case 311:
+                    return KeyEvent.KEYCODE_BUTTON_START;
+                case 312:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBL;
+                case 313:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBR;
+                case 139:
+                    return KeyEvent.KEYCODE_BUTTON_MODE;
+                default:
+                    // Other buttons are mapped correctly
+            }
+
+            // The Xbox button is sent as MENU
+            if (event.getKeyCode() == KeyEvent.KEYCODE_MENU) {
+                return KeyEvent.KEYCODE_BUTTON_MODE;
+            }
+        }

        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
            switch (event.getKeyCode()) {
@@ -478,7 +658,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }
        else if (context.hatXAxis == -1 &&
                 context.hatYAxis == -1 &&
-                 context.isXboxController &&
+                 /* FIXME: There's no good way to know for sure if xpad is bound
+                    to this device, so we won't use the name to validate if these
+                    scancodes should be mapped to DPAD
+
+                    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
@@ -568,9 +753,23 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
+            // Android sends an initial 0 value for trigger axes even if the trigger
+            // should be negative when idle. After the first touch, the axes will go back
+            // to normal behavior, so ignore triggersIdleNegative for each trigger until
+            // first touch.
+            if (lt != 0) {
+                context.leftTriggerUsed = true;
+            }
+            if (rt != 0) {
+                context.rightTriggerUsed = true;
+            }
            if (context.triggersIdleNegative) {
-                lt = (lt + 1) / 2;
-                rt = (rt + 1) / 2;
+                if (context.leftTriggerUsed) {
+                    lt = (lt + 1) / 2;
+                }
+                if (context.rightTriggerUsed) {
+                    rt = (rt + 1) / 2;
+                }
            }

            if (lt <= context.triggerDeadzone) {
@@ -606,7 +805,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    }

    public boolean handleMotionEvent(MotionEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
+        InputDeviceContext context = getContextForEvent(event);
+        if (context == null) {
+            return true;
+        }
+
        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
@@ -637,8 +840,51 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        return true;
    }

+    private short scaleRawStickAxis(float stickValue) {
+        return (short)Math.pow(stickValue, 3);
+    }
+
+    private void sendEmulatedMouseEvent(short x, short y) {
+        Vector2d vector = new Vector2d();
+        vector.initialize(x, y);
+        vector.scalarMultiply(1 / 32766.0f);
+        vector.scalarMultiply(4);
+        if (vector.getMagnitude() > 0) {
+            // Move faster as the stick is pressed further from center
+            vector.scalarMultiply(Math.pow(vector.getMagnitude(), 2));
+            if (vector.getMagnitude() >= 1) {
+                conn.sendMouseMove((short)vector.getX(), (short)-vector.getY());
+            }
+        }
+    }
+
+    private void toggleMouseEmulation(final GenericControllerContext context) {
+        if (context.mouseEmulationTimer != null) {
+            context.mouseEmulationTimer.cancel();
+            context.mouseEmulationTimer = null;
+        }
+
+        context.mouseEmulationActive = !context.mouseEmulationActive;
+        Toast.makeText(activityContext, "Mouse emulation is: " + (context.mouseEmulationActive ? "ON" : "OFF"), Toast.LENGTH_SHORT).show();
+
+        if (context.mouseEmulationActive) {
+            context.mouseEmulationTimer = new Timer();
+            context.mouseEmulationTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    // Send mouse movement events from analog sticks
+                    sendEmulatedMouseEvent(context.leftStickX, context.leftStickY);
+                    sendEmulatedMouseEvent(context.rightStickX, context.rightStickY);
+                }
+            }, 50, 50);
+        }
+    }
+
    public boolean handleButtonUp(KeyEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
+        InputDeviceContext context = getContextForEvent(event);
+        if (context == null) {
+            return true;
+        }

        int keyCode = handleRemapping(context, event);
        if (keyCode == 0) {
@@ -663,10 +909,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            break;
        case KeyEvent.KEYCODE_BUTTON_START:
        case KeyEvent.KEYCODE_MENU:
-            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();
+            // Sometimes we'll get a spurious key up event on controller disconnect.
+            // Make sure it's real by checking that the key is actually down before taking
+            // any action.
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
+                SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS) {
+                toggleMouseEmulation(context);
            }
            context.inputMap &= ~ControllerPacket.PLAY_FLAG;
            break;
@@ -763,7 +1011,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    }

    public boolean handleButtonDown(KeyEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
+        InputDeviceContext context = getContextForEvent(event);
+        if (context == null) {
+            return true;
+        }

        int keyCode = handleRemapping(context, event);
        if (keyCode == 0) {
@@ -855,11 +1106,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            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 || context.emulatingButtonFlags != 0) {
-            sendControllerInputPacket(context);
-        }
+
+        // We don't need to send repeat key down events, but the platform
+        // sends us events that claim to be repeats but they're from different
+        // devices, so we just send them all and deal with some duplicates.
+        sendControllerInputPacket(context);
        return true;
    }

@@ -933,6 +1184,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public short rightStickY = 0x0000;
        public short leftStickX = 0x0000;
        public short leftStickY = 0x0000;
+
+        public boolean mouseEmulationActive;
+        public Timer mouseEmulationTimer;
+        public short mouseEmulationLastInputMap;
    }

    class InputDeviceContext extends GenericControllerContext {
@@ -947,12 +1202,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public int leftTriggerAxis = -1;
        public int rightTriggerAxis = -1;
        public boolean triggersIdleNegative;
+        public boolean leftTriggerUsed, rightTriggerUsed;

        public int hatXAxis = -1;
        public int hatYAxis = -1;

        public boolean isDualShock4;
        public boolean isXboxController;
+        public boolean isXboxBtController;
        public boolean isServal;
        public boolean backIsStart;
        public boolean modeIsSelect;
@@ -1,5 +1,7 @@
 package com.limelight.binding.input;

+import android.view.View;
+
 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.MouseButtonPacket;

@@ -17,23 +19,27 @@ public class TouchContext {
    private boolean confirmedDrag;
    private Timer dragTimer;
    private double distanceMoved;
+    private double xFactor, yFactor;

    private final NvConnection conn;
    private final int actionIndex;
-    private final double xFactor;
-    private final double yFactor;
+    private final int referenceWidth;
+    private final int referenceHeight;
+    private final View targetView;

    private static final int TAP_MOVEMENT_THRESHOLD = 20;
    private static final int TAP_DISTANCE_THRESHOLD = 25;
    private static final int TAP_TIME_THRESHOLD = 250;
    private static final int DRAG_TIME_THRESHOLD = 650;

-    public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
+    public TouchContext(NvConnection conn, int actionIndex,
+                        int referenceWidth, int referenceHeight, View view)
    {
        this.conn = conn;
        this.actionIndex = actionIndex;
-        this.xFactor = xFactor;
-        this.yFactor = yFactor;
+        this.referenceWidth = referenceWidth;
+        this.referenceHeight = referenceHeight;
+        this.targetView = view;
    }

    public int getActionIndex()
@@ -68,6 +74,10 @@ public class TouchContext {

    public boolean touchDownEvent(int eventX, int eventY)
    {
+        // Get the view dimensions to scale inputs on this touch
+        xFactor = referenceWidth / (double)targetView.getWidth();
+        yFactor = referenceHeight / (double)targetView.getHeight();
+
        originalTouchX = lastTouchX = eventX;
        originalTouchY = lastTouchY = eventY;
        originalTouchTime = System.currentTimeMillis();
@@ -0,0 +1,59 @@
+package com.limelight.binding.input.capture;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
+import android.view.MotionEvent;
+import android.view.PointerIcon;
+import android.view.View;
+import android.view.ViewGroup;
+
+@TargetApi(Build.VERSION_CODES.N)
+public class AndroidCaptureProvider extends InputCaptureProvider {
+    private ViewGroup rootViewGroup;
+    private Context context;
+
+    public AndroidCaptureProvider(Activity activity) {
+        this.context = activity;
+        this.rootViewGroup = (ViewGroup) activity.getWindow().getDecorView();
+    }
+
+    public static boolean isCaptureProviderSupported() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
+    }
+
+    private void setPointerIconOnAllViews(PointerIcon icon) {
+        for (int i = 0; i < rootViewGroup.getChildCount(); i++) {
+            View view = rootViewGroup.getChildAt(i);
+            view.setPointerIcon(icon);
+        }
+        rootViewGroup.setPointerIcon(icon);
+    }
+
+    @Override
+    public void enableCapture() {
+        setPointerIconOnAllViews(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
+    }
+
+    @Override
+    public void disableCapture() {
+        setPointerIconOnAllViews(null);
+    }
+
+    @Override
+    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
+        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X) != 0 ||
+                event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y) != 0;
+    }
+
+    @Override
+    public float getRelativeAxisX(MotionEvent event) {
+        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+    }
+
+    @Override
+    public float getRelativeAxisY(MotionEvent event) {
+        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+    }
+}
@@ -0,0 +1,31 @@
+package com.limelight.binding.input.capture;
+
+import android.app.Activity;
+
+import com.limelight.LimeLog;
+import com.limelight.binding.input.evdev.EvdevCaptureProvider;
+import com.limelight.binding.input.evdev.EvdevListener;
+
+public class InputCaptureManager {
+    public static InputCaptureProvider getInputCaptureProvider(Activity activity, EvdevListener rootListener) {
+        // Shield capture is preferred because it can capture when the cursor is over
+        // the system UI. Android N native capture can only capture over views owned
+        // by the application.
+        if (ShieldCaptureProvider.isCaptureProviderSupported()) {
+            LimeLog.info("Using NVIDIA mouse capture extension");
+            return new ShieldCaptureProvider(activity);
+        }
+        else if (EvdevCaptureProvider.isCaptureProviderSupported()) {
+            LimeLog.info("Using Evdev mouse capture");
+            return new EvdevCaptureProvider(activity, rootListener);
+        }
+        else if (AndroidCaptureProvider.isCaptureProviderSupported()) {
+            LimeLog.info("Using Android N+ native mouse capture");
+            return new AndroidCaptureProvider(activity);
+        }
+        else {
+            LimeLog.info("Mouse capture not available");
+            return new NullCaptureProvider();
+        }
+    }
+}
@@ -0,0 +1,21 @@
+package com.limelight.binding.input.capture;
+
+import android.view.MotionEvent;
+
+public abstract class InputCaptureProvider {
+    public abstract void enableCapture();
+    public abstract void disableCapture();
+    public void destroy() {}
+
+    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
+        return false;
+    }
+
+    public float getRelativeAxisX(MotionEvent event) {
+        return 0;
+    }
+
+    public float getRelativeAxisY(MotionEvent event) {
+        return 0;
+    }
+}
@@ -0,0 +1,10 @@
+package com.limelight.binding.input.capture;
+
+
+public class NullCaptureProvider extends InputCaptureProvider {
+    @Override
+    public void enableCapture() {}
+
+    @Override
+    public void disableCapture() {}
+}
@@ -0,0 +1,89 @@
+package com.limelight.binding.input.capture;
+
+
+import android.content.Context;
+import android.hardware.input.InputManager;
+import android.view.MotionEvent;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+// NVIDIA extended the Android input APIs with support for using an attached mouse in relative
+// mode without having to grab the input device (which requires root). The data comes in the form
+// of new AXIS_RELATIVE_X and AXIS_RELATIVE_Y constants in the mouse's MotionEvent objects and
+// a new function, InputManager.setCursorVisibility(), that allows the cursor to be hidden.
+//
+// http://docs.nvidia.com/gameworks/index.html#technologies/mobile/game_controller_handling_mouse.htm
+
+public class ShieldCaptureProvider extends InputCaptureProvider {
+    private static boolean nvExtensionSupported;
+    private static Method methodSetCursorVisibility;
+    private static int AXIS_RELATIVE_X;
+    private static int AXIS_RELATIVE_Y;
+
+    private Context context;
+
+    static {
+        try {
+            methodSetCursorVisibility = InputManager.class.getMethod("setCursorVisibility", boolean.class);
+
+            Field fieldRelX = MotionEvent.class.getField("AXIS_RELATIVE_X");
+            Field fieldRelY = MotionEvent.class.getField("AXIS_RELATIVE_Y");
+
+            AXIS_RELATIVE_X = (Integer) fieldRelX.get(null);
+            AXIS_RELATIVE_Y = (Integer) fieldRelY.get(null);
+
+            nvExtensionSupported = true;
+        } catch (Exception e) {
+            nvExtensionSupported = false;
+        }
+    }
+
+    public ShieldCaptureProvider(Context context) {
+        this.context = context;
+    }
+
+    public static boolean isCaptureProviderSupported() {
+        return nvExtensionSupported;
+    }
+
+    private boolean setCursorVisibility(boolean visible) {
+        try {
+            methodSetCursorVisibility.invoke(context.getSystemService(Context.INPUT_SERVICE), visible);
+            return true;
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+    @Override
+    public void enableCapture() {
+        setCursorVisibility(false);
+    }
+
+    @Override
+    public void disableCapture() {
+        setCursorVisibility(true);
+    }
+
+    @Override
+    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
+        return event.getAxisValue(AXIS_RELATIVE_X) != 0 ||
+                event.getAxisValue(AXIS_RELATIVE_Y) != 0;
+    }
+
+    @Override
+    public float getRelativeAxisX(MotionEvent event) {
+        return event.getAxisValue(AXIS_RELATIVE_X);
+    }
+
+    @Override
+    public float getRelativeAxisY(MotionEvent event) {
+        return event.getAxisValue(AXIS_RELATIVE_Y);
+    }
+}
@@ -0,0 +1,47 @@
+package com.limelight.binding.input.driver;
+
+public abstract class AbstractController {
+
+    private final int deviceId;
+
+    private UsbDriverListener listener;
+
+    protected short buttonFlags;
+    protected float leftTrigger, rightTrigger;
+    protected float rightStickX, rightStickY;
+    protected float leftStickX, leftStickY;
+
+    public int getControllerId() {
+        return deviceId;
+    }
+
+    protected void setButtonFlag(int buttonFlag, int data) {
+        if (data != 0) {
+            buttonFlags |= buttonFlag;
+        }
+        else {
+            buttonFlags &= ~buttonFlag;
+        }
+    }
+
+    protected void reportInput() {
+        listener.reportControllerState(deviceId, buttonFlags, leftStickX, leftStickY,
+                rightStickX, rightStickY, leftTrigger, rightTrigger);
+    }
+
+    public abstract boolean start();
+    public abstract void stop();
+
+    public AbstractController(int deviceId, UsbDriverListener listener) {
+        this.deviceId = deviceId;
+        this.listener = listener;
+    }
+
+    protected void notifyDeviceRemoved() {
+        listener.deviceRemoved(deviceId);
+    }
+
+    protected void notifyDeviceAdded() {
+        listener.deviceAdded(deviceId);
+    }
+}
@@ -0,0 +1,149 @@
+package com.limelight.binding.input.driver;
+
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbEndpoint;
+import android.hardware.usb.UsbInterface;
+
+import com.limelight.LimeLog;
+import com.limelight.binding.video.MediaCodecHelper;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+public abstract class AbstractXboxController extends AbstractController {
+    protected final UsbDevice device;
+    protected final UsbDeviceConnection connection;
+
+    private Thread inputThread;
+    private boolean stopped;
+
+    protected UsbEndpoint inEndpt, outEndpt;
+
+    public AbstractXboxController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
+        super(deviceId, listener);
+        this.device = device;
+        this.connection = connection;
+    }
+
+    private Thread createInputThread() {
+        return new Thread() {
+            public void run() {
+                while (!isInterrupted() && !stopped) {
+                    byte[] buffer = new byte[64];
+
+                    int res;
+
+                    //
+                    // There's no way that I can tell to determine if a device has failed
+                    // or if the timeout has simply expired. We'll check how long the transfer
+                    // took to fail and assume the device failed if it happened before the timeout
+                    // expired.
+                    //
+
+                    do {
+                        // 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");
+                            AbstractXboxController.this.stop();
+                            break;
+                        }
+                    } while (res == -1 && !isInterrupted() && !stopped);
+
+                    if (res == -1 || stopped) {
+                        break;
+                    }
+
+                    if (handleRead(ByteBuffer.wrap(buffer, 0, res).order(ByteOrder.LITTLE_ENDIAN))) {
+                        // Report input if handleRead() returns true
+                        reportInput();
+                    }
+                }
+            }
+        };
+    }
+
+    public boolean start() {
+        // Force claim all interfaces
+        for (int i = 0; i < device.getInterfaceCount(); i++) {
+            UsbInterface iface = device.getInterface(i);
+
+            if (!connection.claimInterface(iface, true)) {
+                LimeLog.warning("Failed to claim interfaces");
+                return false;
+            }
+        }
+
+        // Find the endpoints
+        UsbInterface iface = device.getInterface(0);
+        for (int i = 0; i < iface.getEndpointCount(); i++) {
+            UsbEndpoint endpt = iface.getEndpoint(i);
+            if (endpt.getDirection() == UsbConstants.USB_DIR_IN) {
+                if (inEndpt != null) {
+                    LimeLog.warning("Found duplicate IN endpoint");
+                    return false;
+                }
+                inEndpt = endpt;
+            }
+            else if (endpt.getDirection() == UsbConstants.USB_DIR_OUT) {
+                if (outEndpt != null) {
+                    LimeLog.warning("Found duplicate OUT endpoint");
+                    return false;
+                }
+                outEndpt = endpt;
+            }
+        }
+
+        // Make sure the required endpoints were present
+        if (inEndpt == null || outEndpt == null) {
+            LimeLog.warning("Missing required endpoint");
+            return false;
+        }
+
+        // Run the init function
+        if (!doInit()) {
+            return false;
+        }
+
+        // Report that we're added _before_ starting the input thread
+        notifyDeviceAdded();
+
+        // Start listening for controller input
+        inputThread = createInputThread();
+        inputThread.start();
+
+        return true;
+    }
+
+    public void stop() {
+        if (stopped) {
+            return;
+        }
+
+        stopped = true;
+
+        // Stop the input thread
+        if (inputThread != null) {
+            inputThread.interrupt();
+            inputThread = null;
+        }
+
+        // Close the USB connection
+        connection.close();
+
+        // Report the device removed
+        notifyDeviceRemoved();
+    }
+
+    protected abstract boolean handleRead(ByteBuffer buffer);
+    protected abstract boolean doInit();
+}
@@ -10,7 +10,9 @@ import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
 import android.hardware.usb.UsbManager;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
+import android.view.InputDevice;

 import com.limelight.LimeLog;

@@ -26,10 +28,10 @@ public class UsbDriverService extends Service implements UsbDriverListener {
    private final UsbEventReceiver receiver = new UsbEventReceiver();
    private final UsbDriverBinder binder = new UsbDriverBinder();

-    private final ArrayList<XboxOneController> controllers = new ArrayList<>();
+    private final ArrayList<AbstractController> controllers = new ArrayList<>();

    private UsbDriverListener listener;
-    private static int nextDeviceId;
+    private int nextDeviceId;

    @Override
    public void reportControllerState(int controllerId, short buttonFlags, float leftStickX, float leftStickY, float rightStickX, float rightStickY, float leftTrigger, float rightTrigger) {
@@ -42,7 +44,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
    @Override
    public void deviceRemoved(int controllerId) {
        // Remove the the controller from our list (if not removed already)
-        for (XboxOneController controller : controllers) {
+        for (AbstractController controller : controllers) {
            if (controller.getControllerId() == controllerId) {
                controllers.remove(controller);
                break;
@@ -70,14 +72,14 @@ public class UsbDriverService extends Service implements UsbDriverListener {

            // Initial attachment broadcast
            if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
-                UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);

                // Continue the state machine
                handleUsbDeviceState(device);
            }
            // Subsequent permission dialog completion intent
            else if (action.equals(ACTION_USB_PERMISSION)) {
-                UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);

                // If we got this far, we've already found we're able to handle this device
                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
@@ -93,7 +95,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {

            // Report all controllerMap that already exist
            if (listener != null) {
-                for (XboxOneController controller : controllers) {
+                for (AbstractController controller : controllers) {
                    listener.deviceAdded(controller.getControllerId());
                }
            }
@@ -102,7 +104,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {

    private void handleUsbDeviceState(UsbDevice device) {
        // Are we able to operate it?
-        if (XboxOneController.canClaimDevice(device)) {
+        if (shouldClaimDevice(device)) {
            // Do we have permission yet?
            if (!usbManager.hasPermission(device)) {
                // Let's ask for permission
@@ -117,8 +119,21 @@ public class UsbDriverService extends Service implements UsbDriverListener {
                return;
            }

-            // Try to initialize it
-            XboxOneController controller = new XboxOneController(device, connection, nextDeviceId++, this);
+
+            AbstractController controller;
+
+            if (XboxOneController.canClaimDevice(device)) {
+                controller = new XboxOneController(device, connection, nextDeviceId++, this);
+            }
+            else if (Xbox360Controller.canClaimDevice(device)) {
+                controller = new Xbox360Controller(device, connection, nextDeviceId++, this);
+            }
+            else {
+                // Unreachable
+                return;
+            }
+
+            // Start the controller
            if (!controller.start()) {
                connection.close();
                return;
@@ -129,6 +144,34 @@ public class UsbDriverService extends Service implements UsbDriverListener {
        }
    }

+    private boolean isRecognizedInputDevice(UsbDevice device) {
+        // On KitKat and later, we can determine if this VID and PID combo
+        // matches an existing input device and defer to the built-in controller
+        // support in that case. Prior to KitKat, we'll always return true to be safe.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            for (int id : InputDevice.getDeviceIds()) {
+                InputDevice inputDev = InputDevice.getDevice(id);
+
+                if (inputDev.getVendorId() == device.getVendorId() &&
+                        inputDev.getProductId() == device.getProductId()) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+
+    private boolean shouldClaimDevice(UsbDevice device) {
+        // We always bind to XB1 controllers but only bind to XB360 controllers
+        // if we know the kernel isn't already driving this device.
+        return XboxOneController.canClaimDevice(device) ||
+                (!isRecognizedInputDevice(device) && Xbox360Controller.canClaimDevice(device));
+    }
+
    @Override
    public void onCreate() {
        this.usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
@@ -141,7 +184,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {

        // Enumerate existing devices
        for (UsbDevice dev : usbManager.getDeviceList().values()) {
-            if (XboxOneController.canClaimDevice(dev)) {
+            if (shouldClaimDevice(dev)) {
                // Start the process of claiming this device
                handleUsbDeviceState(dev);
            }
@@ -0,0 +1,136 @@
+package com.limelight.binding.input.driver;
+
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.input.ControllerPacket;
+
+import java.nio.ByteBuffer;
+
+public class Xbox360Controller extends AbstractXboxController {
+    private static final int XB360_IFACE_SUBCLASS = 93;
+    private static final int XB360_IFACE_PROTOCOL = 1; // Wired only
+
+    private static final int[] SUPPORTED_VENDORS = {
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x046d, // Logitech
+            0x0738, // Mad Catz
+            0x0e6f, // Unknown
+            0x12ab, // Unknown
+            0x1430, // RedOctane
+            0x146b, // BigBen
+            0x1bad, // Harmonix
+            0x0f0d, // Hori
+            0x1689, // Razer Onza
+            0x24c6, // PowerA
+            0x1532, // Razer Sabertooth
+            0x15e4, // Numark
+            0x162e, // Joytech
+    };
+
+    public static boolean canClaimDevice(UsbDevice device) {
+        for (int supportedVid : SUPPORTED_VENDORS) {
+            if (device.getVendorId() == supportedVid &&
+                    device.getInterfaceCount() >= 1 &&
+                    device.getInterface(0).getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+                    device.getInterface(0).getInterfaceSubclass() == XB360_IFACE_SUBCLASS &&
+                    device.getInterface(0).getInterfaceProtocol() == XB360_IFACE_PROTOCOL) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public Xbox360Controller(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
+        super(device, connection, deviceId, listener);
+    }
+
+    private int unsignByte(byte b) {
+        if (b < 0) {
+            return b + 256;
+        }
+        else {
+            return b;
+        }
+    }
+
+    @Override
+    protected boolean handleRead(ByteBuffer buffer) {
+        if (buffer.limit() < 14) {
+            LimeLog.severe("Read too small: "+buffer.limit());
+            return false;
+        }
+
+        // Skip first short
+        buffer.position(buffer.position() + 2);
+
+        // DPAD
+        byte b = buffer.get();
+        setButtonFlag(ControllerPacket.LEFT_FLAG, b & 0x04);
+        setButtonFlag(ControllerPacket.RIGHT_FLAG, b & 0x08);
+        setButtonFlag(ControllerPacket.UP_FLAG, b & 0x01);
+        setButtonFlag(ControllerPacket.DOWN_FLAG, b & 0x02);
+
+        // Start/Select
+        setButtonFlag(ControllerPacket.PLAY_FLAG, b & 0x10);
+        setButtonFlag(ControllerPacket.BACK_FLAG, b & 0x20);
+
+        // LS/RS
+        setButtonFlag(ControllerPacket.LS_CLK_FLAG, b & 0x40);
+        setButtonFlag(ControllerPacket.RS_CLK_FLAG, b & 0x80);
+
+        // ABXY buttons
+        b = buffer.get();
+        setButtonFlag(ControllerPacket.A_FLAG, b & 0x10);
+        setButtonFlag(ControllerPacket.B_FLAG, b & 0x20);
+        setButtonFlag(ControllerPacket.X_FLAG, b & 0x40);
+        setButtonFlag(ControllerPacket.Y_FLAG, b & 0x80);
+
+        // LB/RB
+        setButtonFlag(ControllerPacket.LB_FLAG, b & 0x01);
+        setButtonFlag(ControllerPacket.RB_FLAG, b & 0x02);
+
+        // Xbox button
+        setButtonFlag(ControllerPacket.SPECIAL_BUTTON_FLAG, b & 0x04);
+
+        // Triggers
+        leftTrigger = unsignByte(buffer.get()) / 255.0f;
+        rightTrigger = unsignByte(buffer.get()) / 255.0f;
+
+        // Left stick
+        leftStickX = buffer.getShort() / 32767.0f;
+        leftStickY = ~buffer.getShort() / 32767.0f;
+
+        // Right stick
+        rightStickX = buffer.getShort() / 32767.0f;
+        rightStickY = ~buffer.getShort() / 32767.0f;
+
+        // Return true to send input
+        return true;
+    }
+
+    private boolean sendLedCommand(byte command) {
+        byte[] commandBuffer = {0x01, 0x03, command};
+
+        int res = connection.bulkTransfer(outEndpt, commandBuffer, commandBuffer.length, 3000);
+        if (res != commandBuffer.length) {
+            LimeLog.warning("LED set transfer failed: "+res);
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    protected boolean doInit() {
+        // Turn the LED on corresponding to our device ID
+        sendLedCommand((byte)(2 + (getControllerId() % 4)));
+
+        // No need to fail init if the LED command fails
+        return true;
+    }
+}
@@ -3,60 +3,30 @@ package com.limelight.binding.input.driver;
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
-import android.hardware.usb.UsbEndpoint;
-import android.hardware.usb.UsbInterface;

 import com.limelight.LimeLog;
-import com.limelight.binding.video.MediaCodecHelper;
 import com.limelight.nvstream.input.ControllerPacket;

 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;

-public class XboxOneController {
-    private final UsbDevice device;
-    private final UsbDeviceConnection connection;
-    private final int deviceId;
+public class XboxOneController extends AbstractXboxController {

-    private Thread inputThread;
-    private UsbDriverListener listener;
-    private boolean stopped;
-
-    private short buttonFlags;
-    private float leftTrigger, rightTrigger;
-    private float rightStickX, rightStickY;
-    private float leftStickX, leftStickY;
-
-    private static final int MICROSOFT_VID = 0x045e;
    private static final int XB1_IFACE_SUBCLASS = 71;
    private static final int XB1_IFACE_PROTOCOL = 208;

+    private static final int[] SUPPORTED_VENDORS = {
+            0x045e, // Microsoft
+            0x0738, // Mad Catz
+            0x0e6f, // Unknown
+            0x0f0d, // Hori
+            0x24c6, // PowerA
+    };
+
    // FIXME: odata_serial
    private static final byte[] XB1_INIT_DATA = {0x05, 0x20, 0x00, 0x01, 0x00};

    public XboxOneController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
-        this.device = device;
-        this.connection = connection;
-        this.deviceId = deviceId;
-        this.listener = listener;
-    }
-
-    public int getControllerId() {
-        return this.deviceId;
-    }
-
-    private void setButtonFlag(int buttonFlag, int data) {
-        if (data != 0) {
-            buttonFlags |= buttonFlag;
-        }
-        else {
-            buttonFlags &= ~buttonFlag;
-        }
-    }
-
-    private void reportInput() {
-        listener.reportControllerState(deviceId, buttonFlags, leftStickX, leftStickY,
-                rightStickX, rightStickY, leftTrigger, rightTrigger);
+        super(device, connection, deviceId, listener);
    }

    private void processButtons(ByteBuffer buffer) {
@@ -90,103 +60,56 @@ public class XboxOneController {

        rightStickX = buffer.getShort() / 32767.0f;
        rightStickY = ~buffer.getShort() / 32767.0f;
-
-        reportInput();
    }

-    private void processPacket(ByteBuffer buffer) {
+    private void ackModeReport(byte seqNum) {
+        byte[] payload = {0x01, 0x20, seqNum, 0x09, 0x00, 0x07, 0x20, 0x02,
+                0x00, 0x00, 0x00, 0x00, 0x00};
+        connection.bulkTransfer(outEndpt, payload, payload.length, 3000);
+    }
+
+    @Override
+    protected boolean handleRead(ByteBuffer buffer) {
        switch (buffer.get())
        {
            case 0x20:
                buffer.position(buffer.position()+3);
                processButtons(buffer);
-                break;
+                return true;

            case 0x07:
-                buffer.position(buffer.position() + 3);
+                // The Xbox One S controller needs acks for mode reports otherwise
+                // it retransmits them forever.
+                if (buffer.get() == 0x30) {
+                    ackModeReport(buffer.get());
+                    buffer.position(buffer.position() + 1);
+                }
+                else {
+                    buffer.position(buffer.position() + 2);
+                }
                setButtonFlag(ControllerPacket.SPECIAL_BUTTON_FLAG, buffer.get() & 0x01);
-                reportInput();
-                break;
+                return true;
        }
+
+        return false;
    }

-    private void startInputThread(final UsbEndpoint inEndpt) {
-        inputThread = new Thread() {
-            public void run() {
-                while (!isInterrupted() && !stopped) {
-                    byte[] buffer = new byte[64];
-
-                    int res;
-
-                    //
-                    // There's no way that I can tell to determine if a device has failed
-                    // or if the timeout has simply expired. We'll check how long the transfer
-                    // took to fail and assume the device failed if it happened before the timeout
-                    // expired.
-                    //
-
-                    do {
-                        // Read the next input state packet
-                        long lastMillis = MediaCodecHelper.getMonotonicMillis();
-                        res = connection.bulkTransfer(inEndpt, buffer, buffer.length, 3000);
-                        if (res == -1 && MediaCodecHelper.getMonotonicMillis() - lastMillis < 1000) {
-                            LimeLog.warning("Detected device I/O error");
-                            XboxOneController.this.stop();
-                            break;
-                        }
-                    } while (res == -1 && !isInterrupted() && !stopped);
-
-                    if (res == -1 || stopped) {
-                        break;
-                    }
-
-                    processPacket(ByteBuffer.wrap(buffer, 0, res).order(ByteOrder.LITTLE_ENDIAN));
-                }
+    public static boolean canClaimDevice(UsbDevice device) {
+        for (int supportedVid : SUPPORTED_VENDORS) {
+            if (device.getVendorId() == supportedVid &&
+                    device.getInterfaceCount() >= 1 &&
+                    device.getInterface(0).getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+                    device.getInterface(0).getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
+                    device.getInterface(0).getInterfaceProtocol() == XB1_IFACE_PROTOCOL) {
+                return true;
            }
-        };
-        inputThread.setName("Xbox One Controller - Input Thread");
-        inputThread.start();
+        }
+
+        return false;
    }

-    public boolean start() {
-        // Force claim all interfaces
-        for (int i = 0; i < device.getInterfaceCount(); i++) {
-            UsbInterface iface = device.getInterface(i);
-
-            if (!connection.claimInterface(iface, true)) {
-                LimeLog.warning("Failed to claim interfaces");
-                return false;
-            }
-        }
-
-        // Find the endpoints
-        UsbEndpoint outEndpt = null;
-        UsbEndpoint inEndpt = null;
-        UsbInterface iface = device.getInterface(0);
-        for (int i = 0; i < iface.getEndpointCount(); i++) {
-            UsbEndpoint endpt = iface.getEndpoint(i);
-            if (endpt.getDirection() == UsbConstants.USB_DIR_IN) {
-                if (inEndpt != null) {
-                    LimeLog.warning("Found duplicate IN endpoint");
-                    return false;
-                }
-                inEndpt = endpt;
-            }
-            else if (endpt.getDirection() == UsbConstants.USB_DIR_OUT) {
-                if (outEndpt != null) {
-                    LimeLog.warning("Found duplicate OUT endpoint");
-                    return false;
-                }
-                outEndpt = endpt;
-            }
-        }
-
-        // Make sure the required endpoints were present
-        if (inEndpt == null || outEndpt == null) {
-            LimeLog.warning("Missing required endpoint");
-            return false;
-        }
-
+    @Override
+    protected boolean doInit() {
        // Send the initialization packet
        int res = connection.bulkTransfer(outEndpt, XB1_INIT_DATA, XB1_INIT_DATA.length, 3000);
        if (res != XB1_INIT_DATA.length) {
@@ -194,40 +117,6 @@ public class XboxOneController {
            return false;
        }

-        // Start listening for controller input
-        startInputThread(inEndpt);
-
-        // Report this device added via the listener
-        listener.deviceAdded(deviceId);
-
        return true;
    }
-
-    public void stop() {
-        if (stopped) {
-            return;
-        }
-
-        stopped = true;
-
-        // Stop the input thread
-        if (inputThread != null) {
-            inputThread.interrupt();
-            inputThread = null;
-        }
-
-        // Report the device removed
-        listener.deviceRemoved(deviceId);
-
-        // Close the USB connection
-        connection.close();
-    }
-
-    public static boolean canClaimDevice(UsbDevice device) {
-        return device.getVendorId() == MICROSOFT_VID &&
-                device.getInterfaceCount() >= 1 &&
-                device.getInterface(0).getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
-                device.getInterface(0).getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
-                device.getInterface(0).getInterfaceProtocol() == XB1_IFACE_PROTOCOL;
-    }
 }
@@ -1,8 +1,12 @@
 package com.limelight.binding.input.evdev;

-import android.content.Context;
+import android.app.Activity;
+import android.os.Build;
+import android.widget.Toast;

 import com.limelight.LimeLog;
+import com.limelight.LimelightBuildProps;
+import com.limelight.binding.input.capture.InputCaptureProvider;

 import java.io.DataOutputStream;
 import java.io.File;
@@ -12,7 +16,7 @@ import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;

-public class EvdevHandler {
+public class EvdevCaptureProvider extends InputCaptureProvider {

    private final EvdevListener listener;
    private final String libraryPath;
@@ -23,6 +27,8 @@ public class EvdevHandler {
    private Process su;
    private ServerSocket servSock;
    private Socket evdevSock;
+    private Activity activity;
+    private boolean started = false;

    private static final byte UNGRAB_REQUEST = 1;
    private static final byte REGRAB_REQUEST = 2;
@@ -42,24 +48,42 @@ public class EvdevHandler {
                return;
            }

-            // Launch a su shell
-            ProcessBuilder builder = new ProcessBuilder("su");
-            builder.redirectErrorStream(true);
+            final String evdevReaderCmd = libraryPath+File.separatorChar+"libevdev_reader.so "+servSock.getLocalPort();

-            try {
-                su = builder.start();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
+            // On Nougat and later, we'll need to pass the command directly to SU.
+            // Writing to SU's input stream after it has started doesn't seem to work anymore.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                // Launch evdev_reader directly via SU
+                try {
+                    su = Runtime.getRuntime().exec("su -c "+evdevReaderCmd);
+                } catch (IOException e) {
+                    reportDeviceNotRooted();
+                    e.printStackTrace();
+                    return;
+                }
            }
+            else {
+                // Launch a SU shell on Marshmallow and earlier
+                ProcessBuilder builder = new ProcessBuilder("su");
+                builder.redirectErrorStream(true);

-            // Start evdevreader
-            DataOutputStream suOut = new DataOutputStream(su.getOutputStream());
-            try {
-                suOut.writeChars(libraryPath+File.separatorChar+"libevdev_reader.so "+servSock.getLocalPort()+"\n");
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
+                try {
+                    su = builder.start();
+                } catch (IOException e) {
+                    reportDeviceNotRooted();
+                    e.printStackTrace();
+                    return;
+                }
+
+                // Start evdevreader
+                DataOutputStream suOut = new DataOutputStream(su.getOutputStream());
+                try {
+                    suOut.writeChars(evdevReaderCmd+"\n");
+                } catch (IOException e) {
+                    reportDeviceNotRooted();
+                    e.printStackTrace();
+                    return;
+                }
            }

            // Wait for evdevreader's connection
@@ -155,23 +179,48 @@ public class EvdevHandler {
        }
    };

-    public EvdevHandler(Context context, EvdevListener listener) {
+    public EvdevCaptureProvider(Activity activity, EvdevListener listener) {
        this.listener = listener;
-        this.libraryPath = context.getApplicationInfo().nativeLibraryDir;
+        this.activity = activity;
+        this.libraryPath = activity.getApplicationInfo().nativeLibraryDir;
    }

-    public void regrabAll() {
-        if (!shutdown && evdevOut != null) {
-            try {
-                evdevOut.write(REGRAB_REQUEST);
-            } catch (IOException e) {
-                e.printStackTrace();
+    public static boolean isCaptureProviderSupported() {
+        return LimelightBuildProps.ROOT_BUILD;
+    }
+
+    private void reportDeviceNotRooted() {
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(activity, "This device is not rooted - Mouse capture is unavailable", Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    @Override
+    public void enableCapture() {
+        if (!started) {
+            // Start the handler thread if it's our first time
+            // capturing
+            handlerThread.start();
+            started = true;
+        }
+        else {
+            // Send a request to regrab if we're already capturing
+            if (!shutdown && evdevOut != null) {
+                try {
+                    evdevOut.write(REGRAB_REQUEST);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
            }
        }
    }

-    public void ungrabAll() {
-        if (!shutdown && evdevOut != null) {
+    @Override
+    public void disableCapture() {
+        if (started && !shutdown && evdevOut != null) {
            try {
                evdevOut.write(UNGRAB_REQUEST);
            } catch (IOException e) {
@@ -180,15 +229,16 @@ public class EvdevHandler {
        }
    }

-    public void start() {
-        handlerThread.start();
-    }
-
-    public void stop() {
+    @Override
+    public void destroy() {
        // We need to stop the process in this context otherwise
        // we could get stuck waiting on output from the process
        // in order to terminate it.

+        if (!started) {
+            return;
+        }
+
        shutdown = true;
        handlerThread.interrupt();

@@ -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);
        }
    }

@@ -52,7 +52,7 @@ public class DigitalButton extends VirtualControllerElement {
        }
    }

-    private List<DigitalButtonListener> listeners = new ArrayList<DigitalButtonListener>();
+    private List<DigitalButtonListener> listeners = new ArrayList<>();
    private String text = "";
    private int icon = -1;
    private long timerLongClickTimeout = 3000;
@@ -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);
        }
    }

@@ -20,7 +20,9 @@ public class DigitalPad extends VirtualControllerElement {
    public final static int DIGITAL_PAD_DIRECTION_UP = 2;
    public final static int DIGITAL_PAD_DIRECTION_RIGHT = 4;
    public final static int DIGITAL_PAD_DIRECTION_DOWN = 8;
-    List<DigitalPadListener> listeners = new ArrayList<DigitalPadListener>();
+    List<DigitalPadListener> listeners = new ArrayList<>();
+
+    private static final int DPAD_MARGIN = 5;

    private final Paint paint = new Paint();

@@ -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
        );
    }
@@ -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;
@@ -47,7 +48,7 @@ public class VirtualController {
    private RelativeLayout.LayoutParams layoutParamsButtonConfigure = null;
    private Button buttonConfigure = null;

-    private List<VirtualControllerElement> elements = new ArrayList<VirtualControllerElement>();
+    private List<VirtualControllerElement> elements = new ArrayList<>();

    public VirtualController(final NvConnection conn, FrameLayout layout, final Context context) {
        this.connection = conn;
@@ -59,18 +60,27 @@ public class VirtualController {
        frame_layout.addView(relative_layout);

        buttonConfigure = new Button(context);
-        buttonConfigure.setBackgroundResource(R.drawable.settings);
+        buttonConfigure.setBackgroundResource(R.drawable.ic_settings);
        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);
@@ -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)
@@ -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: {
@@ -25,11 +25,13 @@ import android.view.SurfaceHolder;

 public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {

+    private static final boolean USE_FRAME_RENDER_TIME = false;
+
    // Used on versions < 5.0
    private ByteBuffer[] legacyInputBuffers;

-    private String avcDecoderName;
-    private String hevcDecoderName;
+    private MediaCodecInfo avcDecoder;
+    private MediaCodecInfo hevcDecoder;

    private MediaCodec videoDecoder;
    private Thread rendererThread;
@@ -92,33 +94,45 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
    public MediaCodecDecoderRenderer(int videoFormat) {
        //dumpDecoders();

-        MediaCodecInfo avcDecoder = findAvcDecoder();
+        avcDecoder = findAvcDecoder();
        if (avcDecoder != null) {
-            avcDecoderName = avcDecoder.getName();
-            LimeLog.info("Selected AVC decoder: "+avcDecoderName);
+            LimeLog.info("Selected AVC decoder: "+avcDecoder.getName());
        }
        else {
            LimeLog.warning("No AVC decoder found");
        }

-        MediaCodecInfo hevcDecoder = findHevcDecoder(videoFormat);
+        hevcDecoder = findHevcDecoder(videoFormat);
        if (hevcDecoder != null) {
-            hevcDecoderName = hevcDecoder.getName();
-            LimeLog.info("Selected HEVC decoder: "+hevcDecoderName);
+            LimeLog.info("Selected HEVC decoder: "+hevcDecoder.getName());
        }
        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 (avcDecoder != null) {
+            directSubmit = MediaCodecHelper.decoderCanDirectSubmit(avcDecoder.getName());
+            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(avcDecoder.getName());
+
+            if (directSubmit) {
+                LimeLog.info("Decoder "+avcDecoder.getName()+" will use direct submit");
+            }
+        }
    }

    @Override
    public boolean isHevcSupported() {
-        return hevcDecoderName != null;
+        return hevcDecoder != null;
    }

    @Override
    public boolean isAvcSupported() {
-        return avcDecoderName != null;
+        return avcDecoder != null;
    }

    @Override
@@ -132,9 +146,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {

        if (videoFormat == VideoFormat.H264) {
            mimeType = "video/avc";
-            selectedDecoderName = avcDecoderName;
+            selectedDecoderName = avcDecoder.getName();

-            if (avcDecoderName == null) {
+            if (avcDecoder == null) {
                LimeLog.severe("No available AVC decoder!");
                return false;
            }
@@ -159,9 +173,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        }
        else if (videoFormat == VideoFormat.H265) {
            mimeType = "video/hevc";
-            selectedDecoderName = hevcDecoderName;
+            selectedDecoderName = hevcDecoder.getName();

-            if (hevcDecoderName == null) {
+            if (hevcDecoder == null) {
                LimeLog.severe("No available HEVC decoder!");
                return false;
            }
@@ -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 {
@@ -196,9 +202,31 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
            videoFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, height);
        }

+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // Operate at maximum rate to lower latency as much as possible on
+            // some Qualcomm platforms. We could also set KEY_PRIORITY to 0 (realtime)
+            // but that will actually result in the decoder crashing if it can't satisfy
+            // our (ludicrous) operating rate requirement.
+            videoFormat.setInteger(MediaFormat.KEY_OPERATING_RATE, Short.MAX_VALUE);
+        }
+
        videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
        videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);

+        if (USE_FRAME_RENDER_TIME && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            videoDecoder.setOnFrameRenderedListener(new MediaCodec.OnFrameRenderedListener() {
+                @Override
+                public void onFrameRendered(MediaCodec mediaCodec, long presentationTimeUs, long renderTimeNanos) {
+                    long delta = (renderTimeNanos / 1000000L) - (presentationTimeUs / 1000);
+                    if (delta >= 0 && delta < 1000) {
+                        if (USE_FRAME_RENDER_TIME) {
+                            totalTimeMs += delta;
+                        }
+                    }
+                }
+            }, null);
+        }
+
        LimeLog.info("Using codec "+selectedDecoderName+" for hardware decoding "+mimeType);

        return true;
@@ -259,7 +287,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                            long delta = MediaCodecHelper.getMonotonicMillis() - (presentationTimeUs / 1000);
                            if (delta >= 0 && delta < 1000) {
                                decoderTimeMs += delta;
-                                totalTimeMs += delta;
+                                if (!USE_FRAME_RENDER_TIME) {
+                                    totalTimeMs += delta;
+                                }
                            }
                        } else {
                            switch (outIndex) {
@@ -407,7 +437,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                            long delta = MediaCodecHelper.getMonotonicMillis()-(presentationTimeUs/1000);
                            if (delta >= 0 && delta < 1000) {
                                decoderTimeMs += delta;
-                                totalTimeMs += delta;
+                                if (!USE_FRAME_RENDER_TIME) {
+                                    totalTimeMs += delta;
+                                }
                            }
                        } else {
                            switch (outIndex) {
@@ -469,8 +501,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
            } catch (InterruptedException ignored) { }
        }

-        // Stop the decoder
-        videoDecoder.stop();
+        // We could stop the decoder here, but it seems to cause some problems
+        // so we'll just let release take care of it.
    }

    @Override
@@ -778,11 +810,11 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {

    @Override
    public void directSubmitDecodeUnit(DecodeUnit du) {
-        int inputIndex;
+        int inputIndex = -1;

        notifyDuReceived(du);

-        for (;;) {
+        while (!Thread.currentThread().isInterrupted()) {
            try {
                inputIndex = dequeueInputBuffer(true, true);
                break;
@@ -820,8 +852,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
            String str = "";

            str += "Format: "+renderer.videoFormat+"\n";
-            str += "AVC Decoder: "+renderer.avcDecoderName+"\n";
-            str += "HEVC Decoder: "+renderer.hevcDecoderName+"\n";
+            str += "AVC Decoder: "+((renderer.avcDecoder != null) ? renderer.avcDecoder.getName():"(none)")+"\n";
+            str += "HEVC Decoder: "+((renderer.hevcDecoder != null) ? renderer.hevcDecoder.getName():"(none)")+"\n";
            str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
            str += "In stats: "+renderer.numVpsIn+", "+renderer.numSpsIn+", "+renderer.numPpsIn+", "+renderer.numIframeIn+"\n";
            str += "Total frames: "+renderer.totalFrames+"\n";
@@ -34,7 +34,7 @@ public class MediaCodecHelper {
 	private static final List<String> whitelistedHevcDecoders;

    static {
-        directSubmitPrefixes = new LinkedList<String>();
+        directSubmitPrefixes = new LinkedList<>();

        // These decoders have low enough input buffer latency that they
        // can be directly invoked from the receive thread
@@ -48,33 +48,38 @@ public class MediaCodecHelper {
    }

 	static {
-		preferredDecoders = new LinkedList<String>();
+		preferredDecoders = new LinkedList<>();
 	}
 	
 	static {
-		blacklistedDecoderPrefixes = new LinkedList<String>();
+		blacklistedDecoderPrefixes = new LinkedList<>();
 		
 		// Software decoders that don't support H264 high profile
 		blacklistedDecoderPrefixes.add("omx.google");
 		blacklistedDecoderPrefixes.add("AVCDecoder");
+
+		// Without bitstream fixups, we perform horribly on NVIDIA's HEVC
+		// decoder. While not strictly necessary, I'm going to fully blacklist this
+		// one to avoid users getting inaccurate impressions of Tegra X1/Moonlight performance.
+		blacklistedDecoderPrefixes.add("OMX.Nvidia.h265.decode");
 	}
 	
 	static {
-		spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<String>();
+		spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<>();
 		spsFixupBitstreamFixupDecoderPrefixes.add("omx.nvidia");
 		spsFixupBitstreamFixupDecoderPrefixes.add("omx.qcom");
        spsFixupBitstreamFixupDecoderPrefixes.add("omx.brcm");

-        baselineProfileHackPrefixes = new LinkedList<String>();
+        baselineProfileHackPrefixes = new LinkedList<>();
        baselineProfileHackPrefixes.add("omx.intel");

-		whitelistedAdaptiveResolutionPrefixes = new LinkedList<String>();
+		whitelistedAdaptiveResolutionPrefixes = new LinkedList<>();
 		whitelistedAdaptiveResolutionPrefixes.add("omx.nvidia");
 		whitelistedAdaptiveResolutionPrefixes.add("omx.qcom");
 		whitelistedAdaptiveResolutionPrefixes.add("omx.sec");
 		whitelistedAdaptiveResolutionPrefixes.add("omx.TI");

-		constrainedHighProfilePrefixes = new LinkedList<String>();
+		constrainedHighProfilePrefixes = new LinkedList<>();
 		constrainedHighProfilePrefixes.add("omx.intel");
 	}

@@ -213,7 +218,7 @@ public class MediaCodecHelper {
 	@SuppressWarnings("deprecation")
 	@SuppressLint("NewApi")
 	private static LinkedList<MediaCodecInfo> getMediaCodecList() {
-		LinkedList<MediaCodecInfo> infoList = new LinkedList<MediaCodecInfo>();
+		LinkedList<MediaCodecInfo> infoList = new LinkedList<>();
 		
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
@@ -371,7 +376,7 @@ public class MediaCodecHelper {
 					break;
 				cpuInfo.append((char)ch);
 			}
-			
+
 			return cpuInfo.toString();
 		} finally {
 			br.close();
@@ -68,7 +68,7 @@ public class ComputerDatabaseManager {

    public List<ComputerDetails> getAllComputers() {
        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
-        LinkedList<ComputerDetails> computerList = new LinkedList<ComputerDetails>();
+        LinkedList<ComputerDetails> computerList = new LinkedList<>();
        while (c.moveToNext()) {
            ComputerDetails details = new ComputerDetails();

@@ -37,6 +37,9 @@ public class ComputerManagerService extends Service {
    private static final int MDNS_QUERY_PERIOD_MS = 1000;
    private static final int FAST_POLL_TIMEOUT = 500;
    private static final int OFFLINE_POLL_TRIES = 5;
+    private static final int INITIAL_POLL_TRIES = 2;
+    private static final int EMPTY_LIST_THRESHOLD = 3;
+    private static final int POLL_DATA_TTL_MS = 30000;

    private final ComputerManagerBinder binder = new ComputerManagerBinder();

@@ -44,7 +47,7 @@ public class ComputerManagerService extends Service {
    private final AtomicInteger dbRefCount = new AtomicInteger(0);

    private IdentityManager idManager;
-    private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
+    private final LinkedList<PollingTuple> pollingTuples = new LinkedList<>();
    private ComputerManagerListener listener = null;
    private final AtomicInteger activePolls = new AtomicInteger(0);
    private boolean pollingActive = false;
@@ -75,12 +78,15 @@ public class ComputerManagerService extends Service {
            return false;
        }

+        final int pollTriesBeforeOffline = details.state == ComputerDetails.State.UNKNOWN ?
+                INITIAL_POLL_TRIES : OFFLINE_POLL_TRIES;
+
        activePolls.incrementAndGet();

        // Poll the machine
        try {
            if (!pollComputer(details)) {
-                if (!newPc && offlineCount < OFFLINE_POLL_TRIES) {
+                if (!newPc && offlineCount < pollTriesBeforeOffline) {
                    // Return without calling the listener
                    releaseLocalDatabaseReference();
                    return false;
@@ -135,6 +141,7 @@ public class ComputerManagerService extends Service {
                                LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
                                offlineCount++;
                            } else {
+                                tuple.lastSuccessfulPollMs = System.currentTimeMillis();
                                offlineCount = 0;
                            }
                        }
@@ -164,11 +171,18 @@ public class ComputerManagerService extends Service {

            synchronized (pollingTuples) {
                for (PollingTuple tuple : pollingTuples) {
+                    // Enforce the poll data TTL
+                    if (System.currentTimeMillis() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
+                        LimeLog.info("Timing out polled state for "+tuple.computer.name);
+                        tuple.computer.state = ComputerDetails.State.UNKNOWN;
+                        tuple.computer.reachability = ComputerDetails.Reachability.UNKNOWN;
+                    }
+
+                    // Report this computer initially
+                    listener.notifyComputerUpdated(tuple.computer);
+
                    // This polling thread might already be there
                    if (tuple.thread == null) {
-                        // Report this computer initially
-                        listener.notifyComputerUpdated(tuple.computer);
-
                        tuple.thread = createPollingThread(tuple);
                        tuple.thread.start();
                    }
@@ -228,12 +242,29 @@ public class ComputerManagerService extends Service {

            return null;
        }
+
+        public void invalidateStateForComputer(UUID uuid) {
+            synchronized (pollingTuples) {
+                for (PollingTuple tuple : pollingTuples) {
+                    if (uuid.equals(tuple.computer.uuid)) {
+                        // We need the network lock to prevent a concurrent poll
+                        // from wiping this change out
+                        synchronized (tuple.networkLock) {
+                            tuple.computer.state = ComputerDetails.State.UNKNOWN;
+                            tuple.computer.reachability = ComputerDetails.Reachability.UNKNOWN;
+                        }
+                    }
+                }
+            }
+        }
    }

    @Override
    public boolean onUnbind(Intent intent) {
-        // Stop mDNS autodiscovery
-        discoveryBinder.stopDiscovery();
+        if (discoveryBinder != null) {
+            // Stop mDNS autodiscovery
+            discoveryBinder.stopDiscovery();
+        }

        // Stop polling
        pollingActive = false;
@@ -661,6 +692,7 @@ public class ComputerManagerService extends Service {
            thread = new Thread() {
                @Override
                public void run() {
+                    int emptyAppListResponses = 0;
                    do {
                        InetAddress selectedAddr;

@@ -705,7 +737,15 @@ public class ComputerManagerService extends Service {
                            }

                            List<NvApp> list = NvHTTP.getAppListByReader(new StringReader(appList));
-                            if (appList != null && !appList.isEmpty() && !list.isEmpty()) {
+                            if (list.isEmpty()) {
+                                LimeLog.warning("Empty app list received from "+computer.uuid);
+
+                                // The app list might actually be empty, so if we get an empty response a few times
+                                // in a row, we'll go ahead and believe it.
+                                emptyAppListResponses++;
+                            }
+                            if (appList != null && !appList.isEmpty() &&
+                                    (!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
                                // Open the cache file
                                OutputStream cacheOut = null;
                                try {
@@ -721,6 +761,11 @@ public class ComputerManagerService extends Service {
                                    } catch (IOException ignored) {}
                                }

+                                // Reset empty count if it wasn't empty this time
+                                if (!list.isEmpty()) {
+                                    emptyAppListResponses = 0;
+                                }
+
                                // Update the computer
                                computer.rawAppList = appList;
                                receivedAppList = true;
@@ -731,8 +776,8 @@ public class ComputerManagerService extends Service {
                                    listener.notifyComputerUpdated(computer);
                                }
                            }
-                            else {
-                                LimeLog.warning("Empty app list received from "+computer.uuid);
+                            else if (appList == null || appList.isEmpty()) {
+                                LimeLog.warning("Null app list received from "+computer.uuid);
                            }
                        } catch (IOException e) {
                            e.printStackTrace();
@@ -761,6 +806,7 @@ class PollingTuple {
    public Thread thread;
    public final ComputerDetails computer;
    public final Object networkLock;
+    public long lastSuccessfulPollMs;

    public PollingTuple(ComputerDetails computer, Thread thread) {
        this.computer = computer;
@@ -42,7 +42,7 @@ public class DiscoveryService extends Service {

    @Override
    public void onCreate() {
-        WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        WifiManager wifiMgr = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
        multicastLock = wifiMgr.createMulticastLock("Limelight mDNS");
        multicastLock.setReferenceCounted(false);

@@ -3,6 +3,7 @@ package com.limelight.grid;
 import android.app.Activity;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;

 import com.limelight.AppView;
@@ -14,8 +15,6 @@ import com.limelight.grid.assets.MemoryAssetLoader;
 import com.limelight.grid.assets.NetworkAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;

-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.Comparator;

@@ -28,7 +27,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
    private final CachedAppAssetLoader loader;

    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
-        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
+        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item));

        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
        int dp;
@@ -53,9 +52,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
        this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                new NetworkAssetLoader(context, uniqueId),
                new MemoryAssetLoader(),
-                new DiskAssetLoader(context.getCacheDir()),
-                BitmapFactory.decodeResource(activity.getResources(),
-                        R.drawable.image_loading, options));
+                new DiskAssetLoader(context.getCacheDir()));
    }

    public void cancelQueuedOperations() {
@@ -68,7 +65,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
        Collections.sort(itemList, new Comparator<AppView.AppObject>() {
            @Override
            public int compare(AppView.AppObject lhs, AppView.AppObject rhs) {
-                return lhs.app.getAppName().compareTo(rhs.app.getAppName());
+                return lhs.app.getAppName().toLowerCase().compareTo(rhs.app.getAppName().toLowerCase());
            }
        });
    }
@@ -86,9 +83,10 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
        itemList.remove(app);
    }

-    public boolean populateImageView(ImageView imgView, AppView.AppObject obj) {
+    @Override
+    public boolean populateImageView(ImageView imgView, ProgressBar prgView, AppView.AppObject obj) {
        // Let the cached asset loader handle it
-        loader.populateImageView(obj.app, imgView);
+        loader.populateImageView(obj.app, imgView, prgView);
        return true;
    }

@@ -103,9 +101,9 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {

    @Override
    public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
-        if (obj.app.getIsRunning()) {
+        if (obj.isRunning) {
            // Show the play button overlay
-            overlayView.setImageResource(R.drawable.play);
+            overlayView.setImageResource(R.drawable.ic_play);
            return true;
        }

@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;

 import com.limelight.R;
@@ -14,15 +15,13 @@ import java.util.ArrayList;

 public abstract class GenericGridAdapter<T> extends BaseAdapter {
    protected final Context context;
-    protected final int defaultImageRes;
    protected final int layoutId;
-    protected final ArrayList<T> itemList = new ArrayList<T>();
+    protected final ArrayList<T> itemList = new ArrayList<>();
    protected final LayoutInflater inflater;

-    public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
+    public GenericGridAdapter(Context context, int layoutId) {
        this.context = context;
        this.layoutId = layoutId;
-        this.defaultImageRes = defaultImageRes;

        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
    }
@@ -46,7 +45,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
        return i;
    }

-    public abstract boolean populateImageView(ImageView imgView, T obj);
+    public abstract boolean populateImageView(ImageView imgView, ProgressBar prgView, T obj);
    public abstract boolean populateTextView(TextView txtView, T obj);
    public abstract boolean populateOverlayView(ImageView overlayView, T obj);

@@ -59,10 +58,11 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
        ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
        ImageView overlayView = (ImageView) convertView.findViewById(R.id.grid_overlay);
        TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
+        ProgressBar prgView = (ProgressBar) convertView.findViewById(R.id.grid_spinner);

        if (imgView != null) {
-            if (!populateImageView(imgView, itemList.get(i))) {
-                imgView.setImageResource(defaultImageRes);
+            if (!populateImageView(imgView, prgView, itemList.get(i))) {
+                imgView.setImageBitmap(null);
            }
        }
        if (!populateTextView(txtView, itemList.get(i))) {
@@ -1,7 +1,9 @@
 package com.limelight.grid;

 import android.content.Context;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;

 import com.limelight.PcView;
@@ -14,7 +16,7 @@ import java.util.Comparator;
 public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {

    public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item), R.drawable.computer);
+        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item));
    }

    public void addComputer(PcView.ComputerObject computer) {
@@ -26,7 +28,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
        Collections.sort(itemList, new Comparator<PcView.ComputerObject>() {
            @Override
            public int compare(PcView.ComputerObject lhs, PcView.ComputerObject rhs) {
-                return lhs.details.name.compareTo(rhs.details.name);
+                return lhs.details.name.toLowerCase().compareTo(rhs.details.name.toLowerCase());
            }
        });
    }
@@ -36,21 +38,28 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
    }

    @Override
-    public boolean populateImageView(ImageView imgView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+    public boolean populateImageView(ImageView imgView, ProgressBar prgView, PcView.ComputerObject obj) {
+        if (obj.details.state == ComputerDetails.State.ONLINE) {
            imgView.setAlpha(1.0f);
        }
        else {
            imgView.setAlpha(0.4f);
        }

-        // Return false to use the default drawable
-        return false;
+        if (obj.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
+            prgView.setVisibility(View.VISIBLE);
+        }
+        else {
+            prgView.setVisibility(View.INVISIBLE);
+        }
+
+        imgView.setImageResource(R.drawable.ic_computer);
+        return true;
    }

    @Override
    public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+        if (obj.details.state == ComputerDetails.State.ONLINE) {
            txtView.setAlpha(1.0f);
        }
        else {
@@ -63,13 +72,11 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {

    @Override
    public boolean populateOverlayView(ImageView overlayView, PcView.ComputerObject obj) {
-        if (obj.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            // Still refreshing this PC so display the overlay
-            overlayView.setImageResource(R.drawable.image_loading);
+        if (obj.details.state == ComputerDetails.State.OFFLINE) {
+            overlayView.setImageResource(R.drawable.ic_pc_offline);
+            overlayView.setAlpha(0.4f);
            return true;
        }
-
-        // No overlay
        return false;
    }
 }
@@ -5,7 +5,9 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.ProgressBar;

 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
@@ -53,13 +55,13 @@ public class CachedAppAssetLoader {

    public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader, Bitmap placeholderBitmap) {
+                                DiskAssetLoader diskLoader) {
        this.computer = computer;
        this.scalingDivider = scalingDivider;
        this.networkLoader = networkLoader;
        this.memoryLoader = memoryLoader;
        this.diskLoader = diskLoader;
-        this.placeholderBitmap = placeholderBitmap;
+        this.placeholderBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
    }

    public void cancelBackgroundLoads() {
@@ -130,12 +132,14 @@ public class CachedAppAssetLoader {

    private class LoaderTask extends AsyncTask<LoaderTuple, Void, Bitmap> {
        private final WeakReference<ImageView> imageViewRef;
+        private final WeakReference<ProgressBar> progressViewRef;
        private final boolean diskOnly;

        private LoaderTuple tuple;

-        public LoaderTask(ImageView imageView, boolean diskOnly) {
-            this.imageViewRef = new WeakReference<ImageView>(imageView);
+        public LoaderTask(ImageView imageView, ProgressBar prgView, boolean diskOnly) {
+            this.imageViewRef = new WeakReference<>(imageView);
+            this.progressViewRef = new WeakReference<>(prgView);
            this.diskOnly = diskOnly;
        }

@@ -143,8 +147,8 @@ public class CachedAppAssetLoader {
        protected Bitmap doInBackground(LoaderTuple... params) {
            tuple = params[0];

-            // Check whether it has been cancelled or the image view is gone
-            if (isCancelled() || imageViewRef.get() == null) {
+            // Check whether it has been cancelled or the views are gone
+            if (isCancelled() || imageViewRef.get() == null || progressViewRef.get() == null) {
                return null;
            }

@@ -177,11 +181,17 @@ public class CachedAppAssetLoader {

            // If the current loader task for this view isn't us, do nothing
            final ImageView imageView = imageViewRef.get();
+            final ProgressBar prgView = progressViewRef.get();
            if (getLoaderTask(imageView) == this) {
+                // Now display the progress bar since we have to hit the network
+                if (prgView != null) {
+                    prgView.setVisibility(View.VISIBLE);
+                }
+
                // Set off another loader task on the network executor
-                LoaderTask task = new LoaderTask(imageView, false);
+                LoaderTask task = new LoaderTask(imageView, prgView, false);
                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
-                imageView.setAlpha(1.0f);
+                imageView.setVisibility(View.VISIBLE);
                imageView.setImageDrawable(asyncDrawable);
                task.executeOnExecutor(networkExecutor, tuple);
            }
@@ -195,14 +205,20 @@ public class CachedAppAssetLoader {
            }

            final ImageView imageView = imageViewRef.get();
+            final ProgressBar prgView = progressViewRef.get();
            if (getLoaderTask(imageView) == this) {
                // Set the bitmap
                if (bitmap != null) {
                    imageView.setImageBitmap(bitmap);
                }

+                // Hide the progress bar
+                if (prgView != null) {
+                    prgView.setVisibility(View.INVISIBLE);
+                }
+
                // Show the view
-                imageView.setAlpha(1.0f);
+                imageView.setVisibility(View.VISIBLE);
            }
        }
    }
@@ -213,7 +229,7 @@ public class CachedAppAssetLoader {
        public AsyncDrawable(Resources res, Bitmap bitmap,
                             LoaderTask loaderTask) {
            super(res, bitmap);
-            loaderTaskReference = new WeakReference<LoaderTask>(loaderTask);
+            loaderTaskReference = new WeakReference<>(loaderTask);
        }

        public LoaderTask getLoaderTask() {
@@ -280,34 +296,38 @@ public class CachedAppAssetLoader {
        });
    }

-    public void populateImageView(NvApp app, ImageView view) {
+    public boolean populateImageView(NvApp app, ImageView imgView, ProgressBar prgView) {
        LoaderTuple tuple = new LoaderTuple(computer, app);

        // If there's already a task in progress for this view,
        // cancel it. If the task is already loading the same image,
        // we return and let that load finish.
-        if (!cancelPendingLoad(tuple, view)) {
-            return;
+        if (!cancelPendingLoad(tuple, imgView)) {
+            return true;
        }

+        // Hide the progress bar always on initial load
+        prgView.setVisibility(View.INVISIBLE);
+
        // First, try the memory cache in the current context
        Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
        if (bmp != null) {
            // Show the bitmap immediately
-            view.setAlpha(1.0f);
-            view.setImageBitmap(bmp);
-            return;
+            imgView.setVisibility(View.VISIBLE);
+            imgView.setImageBitmap(bmp);
+            return true;
        }

        // If it's not in memory, create an async task to load it. This task will be attached
        // via AsyncDrawable to this view.
-        final LoaderTask task = new LoaderTask(view, true);
-        final AsyncDrawable asyncDrawable = new AsyncDrawable(view.getResources(), placeholderBitmap, task);
-        view.setAlpha(0.0f);
-        view.setImageDrawable(asyncDrawable);
+        final LoaderTask task = new LoaderTask(imgView, prgView, true);
+        final AsyncDrawable asyncDrawable = new AsyncDrawable(imgView.getResources(), placeholderBitmap, task);
+        imgView.setVisibility(View.INVISIBLE);
+        imgView.setImageDrawable(asyncDrawable);

        // Run the task on our foreground executor
        task.executeOnExecutor(foregroundExecutor, tuple);
+        return false;
    }

    public class LoaderTuple {
@@ -7,7 +7,6 @@ import com.limelight.LimeLog;
 import com.limelight.utils.CacheHelper;

 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -29,7 +29,7 @@ import android.widget.Toast;
 public class AddComputerManually extends Activity {
    private TextView hostText;
    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private final LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
+    private final LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<>();
    private Thread addThread;
    private final ServiceConnection serviceConnection = new ServiceConnection() {
        public void onServiceConnected(ComponentName className, final IBinder binder) {
@@ -136,12 +136,7 @@ public class AddComputerManually extends Activity {
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
+        UiHelper.setLocale(this);

        setContentView(R.layout.activity_add_computer_manually);

@@ -3,6 +3,7 @@ package com.limelight.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.preference.PreferenceManager;

@@ -21,7 +22,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;
@@ -100,7 +101,7 @@ public class PreferenceConfiguration {
        }

        // Use small mode on anything smaller than a 7" tablet
-        return context.getResources().getConfiguration().smallestScreenWidthDp < 600;
+        return context.getResources().getConfiguration().smallestScreenWidthDp < 500;
    }

    public static int getDefaultBitrate(Context context) {
@@ -6,8 +6,10 @@ 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;
@@ -24,11 +26,7 @@ public class StreamSettings extends Activity {

        previousPrefs = PreferenceConfiguration.readPreferences(this);

-        if (!previousPrefs.language.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(previousPrefs.language);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
+        UiHelper.setLocale(this);

        setContentView(R.layout.activity_stream_settings);
        getFragmentManager().beginTransaction().replace(
@@ -60,6 +58,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
@@ -0,0 +1,55 @@
+package com.limelight.ui;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.SurfaceView;
+
+public class StreamView extends SurfaceView {
+    private double desiredAspectRatio;
+
+    public void setDesiredAspectRatio(double aspectRatio) {
+        this.desiredAspectRatio = aspectRatio;
+    }
+
+    public StreamView(Context context) {
+        super(context);
+    }
+
+    public StreamView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public StreamView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(21)
+    public StreamView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        // If no fixed aspect ratio has been provided, simply use the default onMeasure() behavior
+        if (desiredAspectRatio == 0) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+
+        // Based on code from: https://www.buzzingandroid.com/2012/11/easy-measuring-of-custom-views-with-specific-aspect-ratio/
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+        int measuredHeight, measuredWidth;
+        if (widthSize > heightSize * desiredAspectRatio) {
+            measuredHeight = heightSize;
+            measuredWidth = (int)(measuredHeight * desiredAspectRatio);
+        } else {
+            measuredWidth = widthSize;
+            measuredHeight = (int)(measuredWidth / desiredAspectRatio);
+        }
+
+        setMeasuredDimension(measuredWidth, measuredHeight);
+    }
+}
@@ -5,6 +5,9 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.widget.Button;
+
+import com.limelight.R;

 public class Dialog implements Runnable {
    private final String title;
@@ -14,7 +17,7 @@ public class Dialog implements Runnable {

    private AlertDialog alert;

-    private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
+    private static final ArrayList<Dialog> rundownDialogs = new ArrayList<>();

    private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
    {
@@ -55,7 +58,7 @@ public class Dialog implements Runnable {
        alert.setCancelable(false);
        alert.setCanceledOnTouchOutside(false);
 
-        alert.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", new DialogInterface.OnClickListener() {
+        alert.setButton(AlertDialog.BUTTON_POSITIVE, activity.getResources().getText(android.R.string.ok), new DialogInterface.OnClickListener() {
              public void onClick(DialogInterface dialog, int which) {
                  synchronized (rundownDialogs) {
                      rundownDialogs.remove(Dialog.this);
@@ -67,6 +70,31 @@ public class Dialog implements Runnable {
                  }
              }
        });
+        alert.setButton(AlertDialog.BUTTON_NEUTRAL, activity.getResources().getText(R.string.help), new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) {
+                synchronized (rundownDialogs) {
+                    rundownDialogs.remove(Dialog.this);
+                    alert.dismiss();
+                }
+
+                if (endAfterDismiss) {
+                    activity.finish();
+                }
+
+                HelpLauncher.launchTroubleshooting(activity);
+            }
+        });
+        alert.setOnShowListener(new DialogInterface.OnShowListener(){
+
+            @Override
+            public void onShow(DialogInterface dialog) {
+                // Set focus to the OK button by default
+                Button button = alert.getButton(AlertDialog.BUTTON_POSITIVE);
+                button.setFocusable(true);
+                button.setFocusableInTouchMode(true);
+                button.requestFocus();
+            }
+        });

        synchronized (rundownDialogs) {
            rundownDialogs.add(this);
@@ -0,0 +1,47 @@
+package com.limelight.utils;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+
+import com.limelight.HelpActivity;
+
+public class HelpLauncher {
+
+    private static void launchUrl(Context context, String url) {
+        // Try to launch the default browser
+        try {
+            // Fire TV devices will lie and say they do have a browser
+            // even though the OS just shows an error dialog if we
+            // try to use it.
+            if (!"Amazon".equalsIgnoreCase(Build.MANUFACTURER)) {
+                Intent i = new Intent(Intent.ACTION_VIEW);
+                i.setData(Uri.parse(url));
+                context.startActivity(i);
+                return;
+            }
+        } catch (Exception e) {
+            // This is only supposed to throw ActivityNotFoundException but
+            // it can (at least) also throw SecurityException if a user's default
+            // browser is not exported. We'll catch everything to workaround this.
+
+            // Fall through
+        }
+
+        // This platform has no browser (possibly a leanback device)
+        // We'll launch our WebView activity
+        Intent i = new Intent(context, HelpActivity.class);
+        i.setData(Uri.parse(url));
+        context.startActivity(i);
+    }
+
+    public static void launchSetupGuide(Context context) {
+        launchUrl(context, "https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide");
+    }
+
+    public static void launchTroubleshooting(Context context) {
+        launchUrl(context, "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
+    }
+}
@@ -23,8 +23,8 @@ public class ServerHelper {
                computer.localIp : computer.remoteIp;
    }

-    public static void doStart(Activity parent, NvApp app, ComputerDetails computer,
-                               ComputerManagerService.ComputerManagerBinder managerBinder) {
+    public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer,
+                                           ComputerManagerService.ComputerManagerBinder managerBinder) {
        Intent intent = new Intent(parent, Game.class);
        intent.putExtra(Game.EXTRA_HOST,
                computer.reachability == ComputerDetails.Reachability.LOCAL ?
@@ -34,7 +34,14 @@ public class ServerHelper {
        intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
        intent.putExtra(Game.EXTRA_STREAMING_REMOTE,
                computer.reachability != ComputerDetails.Reachability.LOCAL);
-        parent.startActivity(intent);
+        intent.putExtra(Game.EXTRA_PC_UUID, computer.uuid.toString());
+        intent.putExtra(Game.EXTRA_PC_NAME, computer.name);
+        return intent;
+    }
+
+    public static void doStart(Activity parent, NvApp app, ComputerDetails computer,
+                               ComputerManagerService.ComputerManagerBinder managerBinder) {
+        parent.startActivity(createStartIntent(parent, app, computer, managerBinder));
    }

    public static void doQuit(final Activity parent,
@@ -0,0 +1,138 @@
+package com.limelight.utils;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+
+import com.limelight.AppView;
+import com.limelight.AppViewShortcutTrampoline;
+import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+public class ShortcutHelper {
+
+    private final ShortcutManager sm;
+    private final Context context;
+
+    public ShortcutHelper(Context context) {
+        this.context = context;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            sm = context.getSystemService(ShortcutManager.class);
+        }
+        else {
+            sm = null;
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.N_MR1)
+    private void reapShortcutsForDynamicAdd() {
+        List<ShortcutInfo> dynamicShortcuts = sm.getDynamicShortcuts();
+        while (dynamicShortcuts.size() >= sm.getMaxShortcutCountPerActivity()) {
+            ShortcutInfo maxRankShortcut = dynamicShortcuts.get(0);
+            for (ShortcutInfo scut : dynamicShortcuts) {
+                if (maxRankShortcut.getRank() < scut.getRank()) {
+                    maxRankShortcut = scut;
+                }
+            }
+            sm.removeDynamicShortcuts(Collections.singletonList(maxRankShortcut.getId()));
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.N_MR1)
+    private List<ShortcutInfo> getAllShortcuts() {
+        LinkedList<ShortcutInfo> list = new LinkedList<>();
+        list.addAll(sm.getDynamicShortcuts());
+        list.addAll(sm.getPinnedShortcuts());
+        return list;
+    }
+
+    @TargetApi(Build.VERSION_CODES.N_MR1)
+    private ShortcutInfo getInfoForId(String id) {
+        List<ShortcutInfo> shortcuts = getAllShortcuts();
+
+        for (ShortcutInfo info : shortcuts) {
+            if (info.getId().equals(id)) {
+                return info;
+            }
+        }
+
+        return null;
+    }
+
+    @TargetApi(Build.VERSION_CODES.N_MR1)
+    private boolean isExistingDynamicShortcut(String id) {
+        for (ShortcutInfo si : sm.getDynamicShortcuts()) {
+            if (si.getId().equals(id)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public void reportShortcutUsed(String id) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ShortcutInfo sinfo = getInfoForId(id);
+            if (sinfo != null) {
+                sm.reportShortcutUsed(id);
+            }
+        }
+    }
+
+    public void createAppViewShortcut(String id, String computerName, String computerUuid, boolean forceAdd) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            Intent i = new Intent(context, AppViewShortcutTrampoline.class);
+            i.putExtra(AppView.NAME_EXTRA, computerName);
+            i.putExtra(AppView.UUID_EXTRA, computerUuid);
+            i.setAction(Intent.ACTION_DEFAULT);
+
+            ShortcutInfo sinfo = new ShortcutInfo.Builder(context, id)
+                    .setIntent(i)
+                    .setShortLabel(computerName)
+                    .setLongLabel(computerName)
+                    .setIcon(Icon.createWithResource(context, R.mipmap.ic_pc_scut))
+                    .build();
+
+            ShortcutInfo existingSinfo = getInfoForId(id);
+            if (existingSinfo != null) {
+                // Update in place
+                sm.updateShortcuts(Collections.singletonList(sinfo));
+                sm.enableShortcuts(Collections.singletonList(id));
+            }
+
+            // Reap shortcuts to make space for this if it's new
+            // NOTE: This CAN'T be an else on the above if, because it's
+            // possible that we have an existing shortcut but it's not a dynamic one.
+            if (!isExistingDynamicShortcut(id)) {
+                // To avoid a random carousel of shortcuts popping in and out based on polling status,
+                // we only add shortcuts if it's not at the limit or the user made a conscious action
+                // to interact with this PC.
+                if (forceAdd || sm.getDynamicShortcuts().size() < sm.getMaxShortcutCountPerActivity()) {
+                    reapShortcutsForDynamicAdd();
+                    sm.addDynamicShortcuts(Collections.singletonList(sinfo));
+                }
+            }
+        }
+    }
+
+    public void createAppViewShortcut(String id, ComputerDetails details, boolean forceAdd) {
+        createAppViewShortcut(id, details.name, details.uuid.toString(), forceAdd);
+    }
+
+    public void disableShortcut(String id, CharSequence reason) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ShortcutInfo sinfo = getInfoForId(id);
+            if (sinfo != null) {
+                sm.disableShortcuts(Collections.singletonList(id), reason);
+            }
+        }
+    }
+}
@@ -15,7 +15,7 @@ public class SpinnerDialog implements Runnable,OnCancelListener {
    private ProgressDialog progress;
    private final boolean finish;

-    private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
+    private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<>();

    private SpinnerDialog(Activity activity, String title, String message, boolean finish)
    {
@@ -9,6 +9,9 @@ import android.content.res.Configuration;
 import android.view.View;

 import com.limelight.R;
+import com.limelight.preferences.PreferenceConfiguration;
+
+import java.util.Locale;

 public class UiHelper {

@@ -16,6 +19,28 @@ public class UiHelper {
    private static final int TV_VERTICAL_PADDING_DP = 27;
    private static final int TV_HORIZONTAL_PADDING_DP = 48;

+    public static void setLocale(Activity activity)
+    {
+        String locale = PreferenceConfiguration.readPreferences(activity).language;
+        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
+            Configuration config = new Configuration(activity.getResources().getConfiguration());
+
+            // Some locales include both language and country which must be separated
+            // before calling the Locale constructor.
+            if (locale.contains("-"))
+            {
+                config.locale = new Locale(locale.substring(0, locale.indexOf('-')),
+                        locale.substring(locale.indexOf('-') + 1));
+            }
+            else
+            {
+                config.locale = new Locale(locale);
+            }
+
+            activity.getResources().updateConfiguration(config, activity.getResources().getDisplayMetrics());
+        }
+    }
+
    public static void notifyNewRootView(Activity activity)
    {
        View rootView = activity.findViewById(android.R.id.content);
@@ -15,6 +15,8 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>

+#include <arpa/inet.h>
+
 #include <android/log.h>

 #define EVDEV_MAX_EVENT_SIZE 24
@@ -0,0 +1,25 @@
+# Android.mk for Moonlight's ENet JNI binding
+MY_LOCAL_PATH := $(call my-dir)
+
+include $(call all-subdir-makefiles)
+
+LOCAL_PATH := $(MY_LOCAL_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := jnienet
+
+LOCAL_SRC_FILES := jnienet.c \
+                   enet/callbacks.c \
+                   enet/compress.c \
+                   enet/host.c \
+                   enet/list.c \
+                   enet/packet.c \
+                   enet/peer.c \
+                   enet/protocol.c \
+                   enet/unix.c \
+                   enet/win32.c \
+
+LOCAL_CFLAGS := -DHAS_SOCKLEN_T=1
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/enet/include
+
+include $(BUILD_SHARED_LIBRARY)
@@ -0,0 +1,148 @@
+#include "enet/enet.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <jni.h>
+
+#define CLIENT_TO_LONG(x) ((intptr_t)(x))
+#define LONG_TO_CLIENT(x) ((ENetHost*)(intptr_t)(x))
+
+#define PEER_TO_LONG(x) ((intptr_t)(x))
+#define LONG_TO_PEER(x) ((ENetPeer*)(intptr_t)(x))
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_initializeEnet(JNIEnv *env, jobject class) {
+    return enet_initialize();
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_createClient(JNIEnv *env, jobject class, jstring address) {
+    ENetAddress enetAddress;
+    const char *addrStr;
+    int err;
+    
+    // Perform a lookup on the address to determine the address family
+    addrStr = (*env)->GetStringUTFChars(env, address, 0);
+    err = enet_address_set_host(&enetAddress, addrStr);
+    (*env)->ReleaseStringUTFChars(env, address, addrStr);
+    if (err < 0) {
+        return CLIENT_TO_LONG(NULL);
+    }
+    
+    // Create a client that can use 1 outgoing connection and 1 channel
+    return CLIENT_TO_LONG(enet_host_create(enetAddress.address.ss_family, NULL, 1, 1, 0, 0));
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_connectToPeer(JNIEnv *env, jobject class, jlong client, jstring address, jint port, jint timeout) {
+    ENetPeer* peer;
+    ENetAddress enetAddress;
+    ENetEvent event;
+    const char *addrStr;
+    int err;
+
+    // Initialize the ENet address
+    addrStr = (*env)->GetStringUTFChars(env, address, 0);    
+    err = enet_address_set_host(&enetAddress, addrStr);
+    enet_address_set_port(&enetAddress, port);
+    (*env)->ReleaseStringUTFChars(env, address, addrStr);
+    if (err < 0) {
+        return PEER_TO_LONG(NULL);
+    }
+    
+    // Start the connection
+    peer = enet_host_connect(LONG_TO_CLIENT(client), &enetAddress, 1, 0);
+    if (peer == NULL) {
+        return PEER_TO_LONG(NULL);
+    }
+    
+    // Wait for the connect to complete
+    if (enet_host_service(LONG_TO_CLIENT(client), &event, timeout) <= 0 || event.type != ENET_EVENT_TYPE_CONNECT) {
+        enet_peer_reset(peer);
+        return PEER_TO_LONG(NULL);
+    }
+    
+    // Ensure the connect verify ACK is sent immediately
+    enet_host_flush(LONG_TO_CLIENT(client));
+
+    // Set the max peer timeout to 10 seconds
+    enet_peer_timeout(peer, ENET_PEER_TIMEOUT_LIMIT, ENET_PEER_TIMEOUT_MINIMUM, 10000);
+    
+    return PEER_TO_LONG(peer);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_readPacket(JNIEnv *env, jobject class, jlong client, jbyteArray data, jint length, jint timeout) {
+    jint err;
+    jbyte* dataPtr;
+    ENetEvent event;
+    
+    // Wait for a receive event, timeout, or disconnect
+    err = enet_host_service(LONG_TO_CLIENT(client), &event, timeout);
+    if (err <= 0) {
+        return err;
+    }
+    else if (event.type != ENET_EVENT_TYPE_RECEIVE) {
+        return -1;
+    }
+    
+    // Check that the packet isn't too large
+    if (event.packet->dataLength > length) {
+        enet_packet_destroy(event.packet);
+        return event.packet->dataLength;
+    }
+    
+    // Copy the packet data into the caller's buffer
+    dataPtr = (*env)->GetByteArrayElements(env, data, 0);
+    memcpy(dataPtr, event.packet->data, event.packet->dataLength);
+    err = event.packet->dataLength;
+    (*env)->ReleaseByteArrayElements(env, data, dataPtr, 0);
+    
+    // Free the packet
+    enet_packet_destroy(event.packet);
+    
+    return err;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_writePacket(JNIEnv *env, jobject class, jlong client, jlong peer, jbyteArray data, jint length, jint packetFlags) {
+    ENetPacket* packet;
+    jboolean ret;
+    jbyte* dataPtr;
+    
+    dataPtr = (*env)->GetByteArrayElements(env, data, 0);
+    
+    // Create the reliable packet that describes our outgoing message
+    packet = enet_packet_create(dataPtr, length, packetFlags);
+    if (packet != NULL) {
+        // Send the message to the peer
+        if (enet_peer_send(LONG_TO_PEER(peer), 0, packet) < 0) {
+            // This can fail if the peer has been disconnected
+            enet_packet_destroy(packet);
+            ret = JNI_FALSE;
+        }
+        else {
+            // Force the client to send the packet now
+            enet_host_flush(LONG_TO_CLIENT(client));
+            ret = JNI_TRUE;
+        }
+    }
+    else {
+        ret = JNI_FALSE;
+    }
+    
+    (*env)->ReleaseByteArrayElements(env, data, dataPtr, JNI_ABORT);
+    
+    return ret;
+}
+
+JNIEXPORT void JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_destroyClient(JNIEnv *env, jobject class, jlong client) {
+    enet_host_destroy(LONG_TO_CLIENT(client));
+}
+
+JNIEXPORT void JNICALL
+Java_com_limelight_nvstream_enet_EnetConnection_disconnectPeer(JNIEnv *env, jobject class, jlong peer) {
+    enet_peer_disconnect_now(LONG_TO_PEER(peer), 0);
+}
@@ -19,7 +19,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this,
 	ChannelCount = channelCount;

 	jni_mapping_data = (*env)->GetByteArrayElements(env, mapping, 0);
-	ret =  nv_opus_init(sampleRate, channelCount, streams, coupledStreams, jni_mapping_data);
+	ret =  nv_opus_init(sampleRate, channelCount, streams, coupledStreams,
+						(const unsigned char*)jni_mapping_data);
 	(*env)->ReleaseByteArrayElements(env, mapping, jni_mapping_data, JNI_ABORT);

 	return ret;
@@ -49,7 +50,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
 	if (indata != NULL) {
 		jni_input_data = (*env)->GetByteArrayElements(env, indata, 0);

-		ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data, SamplesPerChannel);
+		ret = nv_opus_decode((unsigned char*)&jni_input_data[inoff], inlen,
+							 (jshort*)jni_pcm_data, SamplesPerChannel);

 		// The input data isn't changed so it can be safely aborted
 		(*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT);
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="256dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"
+        android:fillColor="#FFFFFF"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="512dp"
+        android:height="512dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z"
+        android:fillColor="#FFFFFF"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="256dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"
+        android:fillColor="#FFFFFF"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"
+        android:fillColor="#FFFFFF"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="256dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
+        android:fillColor="#FFFFFF"/>
+</vector>
@@ -9,41 +9,40 @@
    tools:context=".PcView" >

    <RelativeLayout
-        android:id="@+id/no_pc_found_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true">
-        <ImageView
-            android:id="@+id/pcs_loading"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            android:src="@drawable/image_loading"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/pcs_loading"
-            android:layout_toEndOf="@+id/pcs_loading"
-            android:layout_marginLeft="5dp"
-            android:layout_marginStart="5dp"
-            android:layout_centerVertical="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:gravity="center"
-            android:text="@string/searching_pc"/>
-    </RelativeLayout>
-
-    <FrameLayout
        android:id="@+id/pcFragmentContainer"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:gravity="center"
        android:layout_alignParentBottom="true"
        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/manuallyAddPc"
-        android:layout_toStartOf="@+id/manuallyAddPc"
        android:layout_toRightOf="@+id/settingsButton"
-        android:layout_toEndOf="@+id/settingsButton"/>
+        android:layout_toEndOf="@+id/settingsButton">
+
+        <RelativeLayout
+            android:id="@+id/no_pc_found_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true">
+            <ProgressBar
+                android:id="@+id/pcs_loading"
+                android:layout_width="75dp"
+                android:layout_height="75dp"
+                android:indeterminate="true"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/pcs_loading"
+                android:layout_toEndOf="@+id/pcs_loading"
+                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_centerVertical="true"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:gravity="center"
+                android:text="@string/searching_pc"/>
+        </RelativeLayout>
+
+    </RelativeLayout>

    <ImageButton
        android:id="@+id/settingsButton"
@@ -51,11 +50,22 @@
        android:layout_height="65dp"
        android:cropToPadding="false"
        android:scaleType="fitXY"
-        android:nextFocusDown="@+id/pcGridView"
        android:layout_alignParentStart="true"
        android:layout_alignParentLeft="true"
        android:layout_alignParentTop="true"
-        android:src="@drawable/settings"
+        android:src="@drawable/ic_settings"
+        style="?android:attr/borderlessButtonStyle"/>
+
+    <ImageButton
+        android:id="@+id/helpButton"
+        android:layout_width="70dp"
+        android:layout_height="65dp"
+        android:cropToPadding="false"
+        android:scaleType="fitXY"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@id/settingsButton"
+        android:src="@drawable/ic_help"
        style="?android:attr/borderlessButtonStyle"/>

    <ImageButton
@@ -64,11 +74,10 @@
        android:layout_height="65dp"
        android:cropToPadding="false"
        android:scaleType="fitXY"
-        android:nextFocusDown="@+id/pcGridView"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:src="@drawable/add_computer"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@id/helpButton"
+        android:src="@drawable/ic_add"
        style="?android:attr/borderlessButtonStyle"/>

 </RelativeLayout>
@@ -9,41 +9,44 @@
    tools:context=".PcView" >

    <RelativeLayout
-        android:id="@+id/no_pc_found_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true">
-        <ImageView
-            android:id="@+id/pcs_loading"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            android:src="@drawable/image_loading"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/pcs_loading"
-            android:layout_toEndOf="@+id/pcs_loading"
-            android:layout_marginLeft="5dp"
-            android:layout_marginStart="5dp"
-            android:layout_centerVertical="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:gravity="center"
-            android:text="@string/searching_pc"/>
-    </RelativeLayout>
-
-    <FrameLayout
        android:id="@+id/pcFragmentContainer"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:gravity="center"
-        android:layout_toLeftOf="@+id/manuallyAddPc"
-        android:layout_toStartOf="@+id/manuallyAddPc"
-        android:layout_toRightOf="@+id/settingsButton"
-        android:layout_toEndOf="@+id/settingsButton"
+        android:layout_below="@+id/settingsButton"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true"/>
+        >
+
+        <RelativeLayout
+            android:id="@+id/no_pc_found_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true">
+            <ProgressBar
+                android:id="@+id/pcs_loading"
+                android:layout_width="75dp"
+                android:layout_height="75dp"
+                android:indeterminate="true"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/pcs_loading"
+                android:layout_toEndOf="@+id/pcs_loading"
+                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_centerVertical="true"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:gravity="center"
+                android:text="@string/searching_pc"/>
+        </RelativeLayout>
+
+    </RelativeLayout>

    <ImageButton
        android:id="@+id/settingsButton"
@@ -54,7 +57,19 @@
        android:layout_alignParentLeft="true"
        android:layout_alignParentStart="true"
        android:layout_alignParentTop="true"
-        android:src="@drawable/settings"
+        android:src="@drawable/ic_settings"
+        style="?android:attr/borderlessButtonStyle"/>
+
+    <ImageButton
+        android:id="@+id/helpButton"
+        android:layout_width="70dp"
+        android:layout_height="65dp"
+        android:cropToPadding="false"
+        android:scaleType="fitXY"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@+id/settingsButton"
+        android:layout_toEndOf="@+id/settingsButton"
+        android:src="@drawable/ic_help"
        style="?android:attr/borderlessButtonStyle"/>
    
    <ImageButton
@@ -66,7 +81,7 @@
        android:layout_alignParentTop="true"
        android:layout_alignParentEnd="true"
        android:layout_alignParentRight="true"
-        android:src="@drawable/add_computer"
+        android:src="@drawable/ic_add"
        style="?android:attr/borderlessButtonStyle"/>

 </RelativeLayout>
@@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    tools:context=".Game" >

-    <SurfaceView
+    <com.limelight.ui.StreamView
        android:id="@+id/surfaceView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_help"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.limelight.HelpActivity">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+</RelativeLayout>
@@ -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>
@@ -8,6 +8,14 @@
        android:layout_centerHorizontal="true"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            android:indeterminate="true">
+        </ProgressBar>
        <ImageView
            android:id="@+id/grid_image"
            android:cropToPadding="false"
@@ -8,6 +8,14 @@
        android:layout_centerHorizontal="true"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminate="true">
+        </ProgressBar>
        <ImageView
            android:id="@+id/grid_image"
            android:cropToPadding="false"
@@ -10,23 +10,28 @@
        <ImageView
            android:id="@+id/grid_image"
            android:layout_centerHorizontal="true"
-            android:layout_width="150dp"
-            android:layout_height="100dp">
+            android:layout_width="125dp"
+            android:layout_height="125dp">
        </ImageView>
        <ImageView
            android:id="@+id/grid_overlay"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="65dp"
-            android:layout_marginStart="65dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginEnd="20dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="28dp"
            android:layout_width="50dp"
            android:layout_height="50dp">
        </ImageView>
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="28dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminate="true">
+        </ProgressBar>
    </RelativeLayout>
    <TextView
        android:id="@+id/grid_text"
-        android:layout_width="150dp"
+        android:layout_width="125dp"
        android:layout_height="wrap_content"
        android:layout_below="@id/grid_image_layout"
        android:layout_marginTop="10dp"
@@ -10,23 +10,28 @@
        <ImageView
            android:id="@+id/grid_image"
            android:layout_centerHorizontal="true"
-            android:layout_width="100dp"
-            android:layout_height="67dp">
+            android:layout_width="75dp"
+            android:layout_height="75dp">
        </ImageView>
        <ImageView
            android:id="@+id/grid_overlay"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="42dp"
-            android:layout_marginStart="42dp"
-            android:layout_marginRight="13dp"
-            android:layout_marginEnd="13dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
            android:layout_width="33dp"
            android:layout_height="33dp">
        </ImageView>
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
+            android:layout_width="33dp"
+            android:layout_height="33dp"
+            android:indeterminate="true">
+        </ProgressBar>
    </RelativeLayout>
    <TextView
        android:id="@+id/grid_text"
-        android:layout_width="100dp"
+        android:layout_width="75dp"
        android:layout_height="wrap_content"
        android:layout_below="@id/grid_image_layout"
        android:layout_marginTop="10dp"
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="decoder_names">
+        <item>Automático</item>
+        <item>Forzar decodificación por software</item>
+        <item>Forzar decodificación por hardware</item>
+    </string-array>
+
+    <string-array name="video_format_names">
+        <item>Usar H.265 solo si es estable</item>
+        <item>Siempre usar H.265 (puede fallar)</item>
+        <item>Nunca usar H.265</item>
+    </string-array>
+</resources>
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">Ver lista de juegos</string>
+    <string name="pcview_menu_pair_pc">Emparejar con PC</string>
+    <string name="pcview_menu_unpair_pc">Desemparejar</string>
+    <string name="pcview_menu_send_wol">Enviar petición Wake-On-LAN</string>
+    <string name="pcview_menu_delete_pc">Eliminar PC</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">Emparejando…</string>
+    <string name="pair_pc_offline">El ordenador está apagado</string>
+    <string name="pair_pc_ingame">El ordenador está actualmente en un juego. Debes cerrar el juego antes de emparejar.</string>
+    <string name="pair_pairing_title">Emparejando</string>
+    <string name="pair_pairing_msg">Por favor, introduce el siguiente PIN en el PC destino:</string>
+    <string name="pair_incorrect_pin">PIN incorrecto</string>
+    <string name="pair_fail">Fallo al emparejar</string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online">Ordenador encendido</string>
+    <string name="wol_no_mac">Imposible iniciar PC porque GFE no ha enviado una dirección MAC</string>
+    <string name="wol_waking_pc">Iniciando PC…</string>
+    <string name="wol_waking_msg">Puede tomar algunos segundos iniciar tu PC.
+	    Si no se inicia asegúrate que está configurado correctamente para Wake-On-LAN.
+    </string>
+    <string name="wol_fail">Fallo al enviar paquetes Wake-On-LAN</string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing">Desemparejando…</string>
+    <string name="unpair_success">Desemparejado con éxito</string>
+    <string name="unpair_fail">Error al desemparejar</string>
+    <string name="unpair_error">El dispositivo no estaba emparejado</string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline">El ordenador está apagado</string>
+    <string name="error_manager_not_running">El servicio "ComputerManager" no está en ejecución. Por favor, espera unos segundos o reinicia la aplicación.</string>
+    <string name="error_unknown_host">Fallo al resolver el host</string>
+    <string name="error_404">GFE ha devuelto un error HTTP 404. Asegúrate que el PC tiene una GPU soportada.
+	    Usar software de Escritorio Remoto puede causar este error. Intenta reiniciar el equipo o reinstalar GFE.
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">Estableciendo conexión</string>
+    <string name="conn_establishing_msg">Iniciando conexión</string>
+    <string name="conn_metered">Aviso: ¡Tu conexión de red está siendo medida!</string>
+    <string name="conn_client_latency">Latencia media decodificando frames:</string>
+    <string name="conn_client_latency_hw">latencia decodificación por hardware:</string>
+    <string name="conn_hardware_latency">Latencia media decodificando por hardware:</string>
+    <string name="conn_starting">Iniciando</string>
+    <string name="conn_error_title">Error de conexión</string>
+    <string name="conn_error_msg">Fallo al iniciar</string>
+    <string name="conn_terminated_title">Conexión finalizada</string>
+    <string name="conn_terminated_msg">La conexión ha finalizando</string>
+
+    <!-- General strings -->
+    <string name="ip_hint">Dirección IP del PC con GeForce</string>
+    <string name="searching_pc">Buscando por PCs con GeForce Experience ejecutándose…</string>
+    <string name="yes">Si</string>
+    <string name="no">No</string>
+    <string name="lost_connection">Conexión perdida</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">Aplicaciones en</string>
+    <string name="applist_menu_resume">Reanudar sesión</string>
+    <string name="applist_menu_quit">Cerrar sesión</string>
+    <string name="applist_menu_quit_and_start">Cerrar juego actual e iniciar</string>
+    <string name="applist_menu_cancel">Cancelar</string>
+    <string name="applist_refresh_title">Lista de aplicaciones</string>
+    <string name="applist_refresh_msg">Actualizando lista de aplicaciones…</string>
+    <string name="applist_refresh_error_title">Error</string>
+    <string name="applist_refresh_error_msg">Error al cargar lista de aplicaciones</string>
+    <string name="applist_quit_app">Cerrando</string>
+    <string name="applist_quit_success">Cerrado satisfactoriamente</string>
+    <string name="applist_quit_fail">Error al cerrar</string>
+    <string name="applist_quit_confirmation">¿Estás seguro que deseas quitar la aplicación en ejecución? Todo dato sin salvar se perderá.</string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">Añadir PC manualmente</string>
+    <string name="msg_add_pc">Conectando al PC…</string>
+    <string name="addpc_fail">Imposible conectar al ordenador indicado. Asegurate que los puertos necesarios están permitidos a través del firewall.</string>
+    <string name="addpc_success">Ordenador añadido satisfactoriamente</string>
+    <string name="addpc_unknown_host">Imposible resolver la dirección del PC. Asegúrate que no hay ningún error en la dirección.</string>
+    <string name="addpc_enter_ip">Debes introducir una dirección IP</string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings">Configuración básica</string>
+    <string name="title_resolution_list">Seleccionar resolución y FPS</string>
+    <string name="summary_resolution_list">Establecer unos valores demasiado altos puede causar lag o cierres inesperados</string>
+    <string name="title_seekbar_bitrate">Seleccionar bitrate de vídeo</string>
+    <string name="summary_seekbar_bitrate">Usa bitrate bajo para reducir "parpadeo". Incrementa el bitrate para mayor calidad de imagen.</string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
+    <string name="title_checkbox_stretch_video">Ajustar vídeo a pantalla completa</string>
+    <string name="title_checkbox_disable_warnings">Desactivar mensajes de advertencia</string>
+    <string name="summary_checkbox_disable_warnings">Desactivar mensajes de advertencia en pantalla durante la transmisión</string>
+
+    <string name="category_audio_settings">Configuración de audio</string>
+    <string name="title_checkbox_51_surround">Activar sonido 5.1 surround</string>
+    <string name="summary_checkbox_51_surround">Desmarcar si experimentas problemas de audio. Requiere GFE 2.7 o superior.</string>
+
+    <string name="category_gamepad_settings">Configuración de mando</string>
+    <string name="title_checkbox_multi_controller">Soporte para múltiples mandos</string>
+    <string name="summary_checkbox_multi_controller">Si no está marcado, todos los mandos aparecen como uno solo</string>
+    <string name="title_seekbar_deadzone">Ajustar zona muerta del stick analógico</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Driver para mando Xbox 360/One</string>
+    <string name="summary_checkbox_xb1_driver">Activa el driver USB incluido para dispositivos sin soporte nativo para mandos de Xbox.</string>
+
+    <string name="category_on_screen_controls_settings">Configuración de controles en pantalla</string>
+    <string name="title_checkbox_show_onscreen_controls">Mostrar controles en pantalla</string>
+    <string name="summary_checkbox_show_onscreen_controls">Muestra controles virtuales superpuestos en la pantalla táctil</string>
+
+    <string name="category_ui_settings">Configuración de la interfaz</string>
+    <string name="title_language_list">Idioma</string>
+    <string name="summary_language_list">Idioma a usar por Moonlight</string>
+    <string name="title_checkbox_list_mode">Usar listas en lugar de cuadrículas</string>
+    <string name="summary_checkbox_list_mode">Mostrar aplicaciones y PCs en listas en lugar de el cuadrículas</string>
+    <string name="title_checkbox_small_icon_mode">Usar iconos pequeños</string>
+    <string name="summary_checkbox_small_icon_mode">Usar iconos pequeños en las entradas de cuadrículas para permitir más entradas en la pantalla</string>
+
+    <string name="category_host_settings">Configuración de servidor</string>
+    <string name="title_checkbox_enable_sops">Optimizar configuración del juego</string>
+    <string name="summary_checkbox_enable_sops">Permitir que GFE modifique la configuración del juego para una transmisión óptima</string>
+    <string name="title_checkbox_host_audio">Reproducir audio en PC</string>
+    <string name="summary_checkbox_host_audio">Reproducir audio en el ordenador y en este dispositivo</string>
+
+    <string name="category_advanced_settings">Configuración avanzada</string>
+    <string name="title_video_format">Cambiar configuración H.265</string>
+    <string name="summary_video_format">H.265 reduce el ancho de banda de vídeo, pero requiere un dispositivo bastante actual.</string>
+
+</resources>
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Shortcut strings -->
+    <string name="scut_deleted_pc">PC supprimé</string>
+    <string name="scut_not_paired">PC non appairé</string>
+
+    <!-- Help strings -->
+    <string name="help_loading_title">Visionneuse d\'aide</string>
+    <string name="help_loading_msg">Chargement de la page d\'aide…</string>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">Afficher la liste des jeux</string>
+    <string name="pcview_menu_pair_pc">Appairer avec PC</string>
+    <string name="pcview_menu_unpair_pc">Désappairer</string>
+    <string name="pcview_menu_send_wol">Envoyer la requête Wake-On-LAN</string>
+    <string name="pcview_menu_delete_pc">Supprimer PC</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">Appariement…</string>
+    <string name="pair_pc_offline">L\'ordinateur est hors ligne</string>
+    <string name="pair_pc_ingame">L\'ordinateur est actuellement dans un jeu. Vous devez fermer le jeu avant l\'appariement.</string>
+    <string name="pair_pairing_title">Appariement</string>
+    <string name="pair_pairing_msg">SVP entrer le code PIN suivant sur le PC concerné:</string>
+    <string name="pair_incorrect_pin">Code PIN incorrect</string>
+    <string name="pair_fail">Échec de l\'appariement</string>
+    <string name="pair_already_in_progress">Appariement déjà en cours</string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online">L\'ordinateur est en ligne</string>
+    <string name="wol_no_mac">Impossible de réveiller le PC car GFE n\'a pas envoyé d\'adresse MAC</string>
+    <string name="wol_waking_pc">Réveil PC…</string>
+    <string name="wol_waking_msg">Votre PC peut prendre quelques secondes pour se réveiller.
+        Si ce n\'est pas le cas, assurez-vous qu\'il est correctement configuré pour Wake-On-LAN.
+    </string>
+    <string name="wol_fail">Échec de l\'envoi des paquets Wake-On-LAN</string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing">Désappariage…</string>
+    <string name="unpair_success">Désapparié avec succès</string>
+    <string name="unpair_fail">Échec de désappariement</string>
+    <string name="unpair_error">Le périphérique n\'a pas été appareillé</string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline">L\'ordinateur est déconnecté</string>
+    <string name="error_manager_not_running">Le service ComputerManager n\'est pas en cours d\'exécution. Veuillez patienter quelques secondes ou redémarrer l\'application.</string>
+    <string name="error_unknown_host">Échec de la résolution de l\'hôte</string>
+    <string name="error_404">GFE renvoi une erreur HTTP 404. Assurez-vous que votre PC exécute un GPU pris en charge.
+        L\'utilisation d\'un logiciel de bureau à distance peut également provoquer cette erreur. Essayez de redémarrer votre machine ou de réinstaller GFE.
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">Établissement de la connexion</string>
+    <string name="conn_establishing_msg">Démarrage de la connection</string>
+    <string name="conn_metered">Attention: Votre connexion réseau active est mesurée!</string>
+    <string name="conn_client_latency">Latence moyenne de décodage de trame:</string>
+    <string name="conn_client_latency_hw">Latence du décodeur matériel:</string>
+    <string name="conn_hardware_latency">Latence moyenne du décodage matériel:</string>
+    <string name="conn_starting">Démarrage</string>
+    <string name="conn_error_title">Erreur de connexion</string>
+    <string name="conn_error_msg">Impossible de démarrer</string>
+    <string name="conn_terminated_title">Connexion terminée</string>
+    <string name="conn_terminated_msg">La connexion a été interrompue</string>
+
+    <!-- General strings -->
+    <string name="ip_hint">Adresse IP de GeForce PC</string>
+    <string name="searching_pc">Recherche de PC avec GameStream en cours...\n\n
+        Assurez-vous que GameStream est activé dans les paramètres GeForce Experience SHIELD.</string>
+    <string name="yes">Oui</string>
+    <string name="no">Non</string>
+    <string name="lost_connection">Perte de connexion avec le PC</string>
+    <string name="help">Aide</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">Applications sur</string>
+    <string name="applist_connect_msg">Connexion au PC…</string>
+    <string name="applist_menu_resume">Reprise de la session</string>
+    <string name="applist_menu_quit">Quitter la session</string>
+    <string name="applist_menu_quit_and_start">Quitter le jeu actuel et démarrer</string>
+    <string name="applist_menu_cancel">Annuler</string>
+    <string name="applist_refresh_title">Liste des applications</string>
+    <string name="applist_refresh_msg">Actualisation des applications…</string>
+    <string name="applist_refresh_error_title">Erreur</string>
+    <string name="applist_refresh_error_msg">Impossible d\'obtenir la liste des applications</string>
+    <string name="applist_quit_app">Fermeture</string>
+    <string name="applist_quit_success">Fermeture avec succès</string>
+    <string name="applist_quit_fail">Échec de la fermeture</string>
+    <string name="applist_quit_confirmation">Voulez-vous vraiment quitter l\'application en cours d\'exécution? Toutes les données non enregistrées seront perdues.</string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">Ajouter un PC manuellement</string>
+    <string name="msg_add_pc">Connexion au PC…</string>
+    <string name="addpc_fail">Impossible de se connecter à l\'ordinateur spécifié. Assurez-vous que les ports requis sont autorisés par le pare-feu.</string>
+    <string name="addpc_success">Ajouté avec succès de l\'ordinateur</string>
+    <string name="addpc_unknown_host">Impossible de résoudre l\'adresse du PC. Assurez-vous que vous n\'avez pas fait une faute de frappe dans l\'adresse.</string>
+    <string name="addpc_enter_ip">Vous devez entrer une adresse IP</string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings">Paramètres de base</string>
+    <string name="title_resolution_list">Sélectionner la résolution et les FPS à atteindre</string>
+    <string name="summary_resolution_list">Le réglage de valeurs trop élevées pour votre appareil peut provoquer un retard ou un plantage</string>
+    <string name="title_seekbar_bitrate">Sélectionnez le bitrate vidéo à obtenir</string>
+    <string name="summary_seekbar_bitrate">Bitrate inférieur pour réduire la saccade. Augmentez le bitrate pour augmenter la qualité de l\'image.</string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
+    <string name="title_checkbox_stretch_video">Étirez la vidéo en plein écran</string>
+    <string name="title_checkbox_disable_warnings">Désactiver les messages d\'avertissement</string>
+    <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant le streaming</string>
+
+    <string name="category_audio_settings">Paramètres audio</string>
+    <string name="title_checkbox_51_surround">Activer son surround 5.1</string>
+    <string name="summary_checkbox_51_surround">Décochez si vous rencontrez des problèmes audio. Nécessite GFE 2.7 ou supérieur.</string>
+
+    <string name="category_gamepad_settings">Paramètres du gamepad</string>
+    <string name="title_checkbox_multi_controller">Prise en charge de plusieurs contrôleurs</string>
+    <string name="summary_checkbox_multi_controller">Lorsqu\'elle n\'est pas cochée, tous les contrôleurs sont regroupés</string>
+    <string name="title_seekbar_deadzone">Régler la zone morte du stick analogique</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Pilote de contrôleur Xbox 360/One</string>
+    <string name="summary_checkbox_xb1_driver">Active un pilote USB intégré pour les périphériques sans prise en charge du contrôleur Xbox natif.</string>
+
+    <string name="category_on_screen_controls_settings">Paramètres des contrôles à l\'écran</string>
+    <string name="title_checkbox_show_onscreen_controls">Afficher les commandes à l\'écran</string>
+    <string name="summary_checkbox_show_onscreen_controls">Afficher la superposition du contrôleur virtuel sur l\'écran tactile</string>
+
+    <string name="category_ui_settings">Paramètres de l\'interface utilisateur</string>
+    <string name="title_language_list">Langue</string>
+    <string name="summary_language_list">Langue à utiliser pour Moonlight</string>
+    <string name="title_checkbox_list_mode">Utiliser des listes au lieu des grilles</string>
+    <string name="summary_checkbox_list_mode">Afficher les applications et les PC en listes au lieu de grilles</string>
+    <string name="title_checkbox_small_icon_mode">Utiliser des petites icônes</string>
+    <string name="summary_checkbox_small_icon_mode">Utilisez les petites icônes dans les éléments de la grille pour permettre plus d\'éléments à l\'écran</string>
+
+    <string name="category_host_settings">Paramètres de l\'hôte</string>
+    <string name="title_checkbox_enable_sops">Optimiser les paramètres de jeu</string>
+    <string name="summary_checkbox_enable_sops">Autoriser GFE à modifier les paramètres de jeu pour une diffusion optimale</string>
+    <string name="title_checkbox_host_audio">Jouer l\'audio sur le PC</string>
+    <string name="summary_checkbox_host_audio">Lire l\'audio de l\'ordinateur et de ce périphérique</string>
+
+    <string name="category_advanced_settings">Réglages avancés</string>
+    <string name="title_video_format">Modifier les paramètres H.265</string>
+    <string name="summary_video_format">H.265 réduit les exigences de bande passante vidéo, mais requiert un périphérique très récent.</string>
+</resources>
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="resolution_names">
-        <item>720p - 30 FPS</item>
-        <item>720p - 60 FPS</item>
-        <item>1080p - 30 FPS</item>
-        <item>1080p - 60 FPS</item>
-        <item>4K - 30 FPS</item>
-        <item>4K - 60 FPS</item>
-    </string-array>
-
    <string-array name="decoder_names">
        <item>Scegli decoder automaticamente</item>
        <item>Forza decoder software</item>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string-array name="decoder_names">
+      <item>デコーダを自動選択</item>
+        <item>ソフトウェアデコードを強制</item>
+        <item>ハードウェアデコードを強制</item>
+    </string-array>
+
+    <string-array name="video_format_names">
+        <item>安定している場合にH.265を有効化</item>
+        <item>H.265を強制的に有効化(クラッシュする可能性があります)</item>
+        <item>H.265を無効化</item>
+    </string-array>
+</resources>
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">ゲームリストを表示</string>
+    <string name="pcview_menu_pair_pc">コンピュータとペアリング</string>
+    <string name="pcview_menu_unpair_pc">ペアリングを解除r</string>
+    <string name="pcview_menu_send_wol">Wake-On-LANリクエストを送信する</string>
+    <string name="pcview_menu_delete_pc">コンピュータをリストから削除する</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">ペアリング中</string>
+    <string name="pair_pc_offline">コンピュータはオフラインです</string>
+    <string name="pair_pc_ingame">現在このコンピュータはゲームを実行中のため、ペアリングする前にゲームを閉じる必要があります</string>
+    <string name="pair_pairing_title">ペアリング</string>
+    <string name="pair_pairing_msg">ペアリングしたいコンピュータのPINコードを入力してください:</string>
+    <string name="pair_incorrect_pin">PINコードが間違っています</string>
+    <string name="pair_fail">ペアリングに失敗しました</string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online">コンピュータはオンラインです</string>
+    <string name="wol_no_mac">GFEがMACアドレスを送信しなかったため、コンピュータを起動することができません</string>
+    <string name="wol_waking_pc">コンピュータを起動中</string>
+    <string name="wol_waking_msg">コンピュータが起動するまで数秒かかる可能性があります。Wake-On-LANが正しく構成されているか確認してください</string>
+    <string name="wol_fail">Wake-On-LANパケットの送信に失敗しました</string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing">ペアリングの解除中</string>
+    <string name="unpair_success">ペアリングの解除に成功しました</string>
+    <string name="unpair_fail">ペアリングの解除に失敗しました</string>
+    <string name="unpair_error">このデバイスはペアリングされませんでした</string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline">コンピュータはオフラインです</string>
+    <string name="error_manager_not_running">ComputerManagerサービスが動作していません。しばらく待つか、Moonlightを再起動してください</string>
+    <string name="error_unknown_host">ホストが解決できません</string>
+    <string name="error_404">GFEがHTTP 404を返しました。コンピュータでサポートされているGPUが動作しているか確認してください。リモートデスクトップソフトウェアでもこのエラーが発生する可能性があります。コンピュータを再起動するか、GFEを再インストールしてください</string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">接続を確立</string>
+    <string name="conn_establishing_msg">接続を開始</string>
+    <string name="conn_metered">警告: 現在使用中のネットワークは従量制課金接続です</string>
+    <string name="conn_client_latency"> デコードの平均待ち時間:</string>
+    <string name="conn_client_latency_hw">ハードウェアデコーダーの待ち時間</string>
+    <string name="conn_hardware_latency">ハードウェアデコーダーの平均待ち時間:</string>
+    <string name="conn_starting">開始</string>
+    <string name="conn_error_title">接続エラー</string>
+    <string name="conn_error_msg">開始できません</string>
+    <string name="conn_terminated_title">接続を終了</string>
+    <string name="conn_terminated_msg">接続は終了しました</string>
+
+    <!-- General strings -->
+    <string name="ip_hint">コンピュータのIPアドレス</string>
+    <string name="searching_pc">コンピュータを検索中</string>
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="lost_connection">コンピュータとの接続が失われました</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">ゲーム</string>
+    <string name="applist_menu_resume">セッションを続ける</string>
+    <string name="applist_menu_quit">セッションを終了する</string>
+    <string name="applist_menu_quit_and_start">現在のゲームを終了して新しいゲームを始める</string>
+    <string name="applist_menu_cancel">キャンセル</string>
+    <string name="applist_refresh_title">ゲームリスト</string>
+    <string name="applist_refresh_msg">ゲームリストを更新中</string>
+    <string name="applist_refresh_error_title">エラー</string>
+    <string name="applist_refresh_error_msg">ゲームリストの取得に失敗しました</string>
+    <string name="applist_quit_app">終了中</string>
+    <string name="applist_quit_success">ゲームを終了しました</string>
+    <string name="applist_quit_fail">ゲームが終了できませんでした</string>
+    <string name="applist_quit_confirmation">本当にゲームを終了しますか?  保存されていないデータは破棄されます</string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">手動でコンピュータを追加する</string>
+    <string name="msg_add_pc">コンピュータに接続中</string>
+    <string name="addpc_fail">指定されたコンピュータに接続できませんでした。ファイアーウォールの設定を確認してください</string>
+    <string name="addpc_success">コンピュータの追加に成功しました</string>
+    <string name="addpc_unknown_host">コンピュータのアドレスが解決できません。コンピュータのアドレスを確認してください</string>
+    <string name="addpc_enter_ip">IPアドレスを入力してください</string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings">基本的な設定</string>
+    <string name="title_resolution_list">解像度とフレームレート</string>
+    <string name="summary_resolution_list">品質が高いほどラグとクラッシュが発生しやすくなります</string>
+    <string name="title_seekbar_bitrate">映像のビットレート</string>
+    <string name="summary_seekbar_bitrate">ビットレートを低くすればカクつきが抑制され、高くすれば画質が向上します</string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
+    <string name="title_checkbox_stretch_video">映像を全画面に拡大</string>
+    <string name="title_checkbox_disable_warnings">警告を無効化</string>
+    <string name="summary_checkbox_disable_warnings">ストリーミング中に画面に警告メッセージを表示しない</string>
+
+    <string name="category_audio_settings">音声</string>
+    <string name="title_checkbox_51_surround">5.1chサラウンド</string>
+    <string name="summary_checkbox_51_surround">音声に問題が生じる場合はチェックを外してください。バージョン2.7以降のGFEが必要です</string>
+
+    <string name="category_gamepad_settings">ゲームコントローラ</string>
+    <string name="title_checkbox_multi_controller">複数のゲームコントローラ</string>
+    <string name="summary_checkbox_multi_controller">チェックを外すと、全てのゲームコントローラが単一の物として認識されます</string>
+    <string name="title_seekbar_deadzone">アナログゲームコントローラのデッドゾーン</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Xbox 360/Oneコントローラ</string>
+    <string name="summary_checkbox_xb1_driver">XboxゲームコントローラをサポートしないデバイスでXboxゲームコントローラ用のドライバを有効にします</string>
+
+    <string name="category_on_screen_controls_settings">オンスクリーンコントローラ</string>
+    <string name="title_checkbox_show_onscreen_controls">オンスクリーンコントローラ</string>
+    <string name="summary_checkbox_show_onscreen_controls">タッチスクリーン上にオンスクリーンコントローラを表示します</string>
+
+    <string name="category_ui_settings">インターフェース</string>
+    <string name="title_language_list">言語</string>
+    <string name="summary_language_list">Moonlightで使用する言語</string>
+    <string name="title_checkbox_list_mode">リストメニュー</string>
+    <string name="summary_checkbox_list_mode">ゲームをグリッドではなく、リストで表示します</string>
+    <string name="title_checkbox_small_icon_mode">小さなアイコン</string>
+    <string name="summary_checkbox_small_icon_mode">グリッドで小さなアイコンを使用します</string>
+
+    <string name="category_host_settings">ホスト</string>
+    <string name="title_checkbox_enable_sops">ゲーム設定の最適化</string>
+    <string name="summary_checkbox_enable_sops">GFEがゲームの設定を最適化します</string>
+    <string name="title_checkbox_host_audio">コンピュータで音声を再生</string>
+    <string name="summary_checkbox_host_audio">音声をコンピュータとこのデバイスの両方で再生します</string>
+
+    <string name="category_advanced_settings">高度な設定</string>
+    <string name="title_video_format">H.265</string>
+    <string name="summary_video_format">H.265は動画に必要な帯域幅を圧縮します。この機能にはなるべく新しいデバイスが必要です</string>
+
+</resources>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="decoder_names">
+        <item>자동으로 선택</item>
+        <item>강제 소프트웨어 디코딩</item>
+        <item>강제 하드웨어 디코딩</item>
+    </string-array>
+
+    <string-array name="video_format_names">
+        <item>안정적인 경우에 H.265 사용</item>
+        <item>항상 H.265 사용(깨질 가능성 있음)</item>
+        <item>H.265 사용하지 않기</item>
+    </string-array>
+</resources>
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Shortcut strings -->
+    <string name="scut_deleted_pc">PC 삭제됨</string>
+    <string name="scut_not_paired">PC와 페어링되지 않음</string>
+
+    <!-- Help strings -->
+    <string name="help_loading_title">도움말 뷰어</string>
+    <string name="help_loading_msg">도움말 페이지 로딩중…</string>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">게임 리스트 보이기</string>
+    <string name="pcview_menu_pair_pc">PC와 페어링</string>
+    <string name="pcview_menu_unpair_pc">페어링 해제</string>
+    <string name="pcview_menu_send_wol">Wake-On-LAN request 보내기</string>
+    <string name="pcview_menu_delete_pc">PC 삭제</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">페어링 중…</string>
+    <string name="pair_pc_offline">컴퓨터가 오프라인입니다.</string>
+    <string name="pair_pc_ingame">컴퓨터가 아직 게임을 실행중입니다. 페어링 전 게임을 종료하세요.</string>
+    <string name="pair_pairing_title">페어링</string>
+    <string name="pair_pairing_msg">아래 PIN을 페어링 할 PC에 입력하세요:</string>
+    <string name="pair_incorrect_pin">PIN이 올바르지 않음</string>
+    <string name="pair_fail">페어링 실패</string>
+    <string name="pair_already_in_progress">페어링이 이미 진행중입니다</string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online">컴퓨터가 온라인 상태입니다</string>
+    <string name="wol_no_mac">Geforce Experience가 MAC 주소를 보내지 않아 PC를 깨울 수 없습니다.</string>
+    <string name="wol_waking_pc">PC를 깨우는 중…</string>
+    <string name="wol_waking_msg">PC를 깨우는 데에 약간의 시간이 걸립니다.
+        PC가 깨워지지 않으면, Wake-On-Lan이 설정되어있는지 확인하세요.
+    </string>
+    <string name="wol_fail">Wake-On-LAN 패킷을 보내는 데에 실패했습니다</string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing">페어링 해제중…</string>
+    <string name="unpair_success">페어링 해제 완료</string>
+    <string name="unpair_fail">페어링 해제 실패</string>
+    <string name="unpair_error">장치가 페어링되지 않음</string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline">컴퓨터가 오프라인 상태입니다</string>
+    <string name="error_manager_not_running">ComputerManager 서비스가 실행되지 않고 있습니다. 몇 초 기다리거나 앱을 다시 시작하세요.</string>
+    <string name="error_unknown_host">호스트 응답에 실패함</string>
+    <string name="error_404">GFE가 HTTP 404에러를 보냈습니다. 지원되는 GPU가 설치되어 있는지 확인하세요.
+	    원격 데스트톱 응용 프로그램을 사용하는 것도 이 에러를 유발할 수 있습니다. PC를 다시 시작하거나 Geforce Experience를 다시 설치해보세요. 
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">연결 수립중</string>
+    <string name="conn_establishing_msg">연결 시작</string>
+    <string name="conn_metered">경고: 데이터 요금이 부과될 수 있습니다.</string>
+    <string name="conn_client_latency">평균 프레임 디코딩 지연:</string>
+    <string name="conn_client_latency_hw">하드웨어 디코더 지연:</string>
+    <string name="conn_hardware_latency">평균 하드웨어 디코딩 지연:</string>
+    <string name="conn_starting">시작 중</string>
+    <string name="conn_error_title">연결 오류</string>
+    <string name="conn_error_msg">시작 실패</string>
+    <string name="conn_terminated_title">연결 종료 됨</string>
+    <string name="conn_terminated_msg">연결이 종료되었습니다</string>
+
+    <!-- General strings -->
+    <string name="ip_hint">GeForce PC의 IP 주소</string>
+    <string name="searching_pc">GameStream이 실행중인 PC를 검색중…\n\n
+        GameStream이 Geforce Experience 설정에서 활성화되어있는지 확인하세요.</string>
+    <string name="yes">예</string>
+    <string name="no">아니오</string>
+    <string name="lost_connection">PC 연결 끊김</string>
+    <string name="help">도움말</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">앱 사용 가능</string>
+    <string name="applist_connect_msg">PC에 연결중…</string>
+    <string name="applist_menu_resume">세션 계속</string>
+    <string name="applist_menu_quit">세션 종료</string>
+    <string name="applist_menu_quit_and_start">현재 게임 종료 후 시작</string>
+    <string name="applist_menu_cancel">취소</string>
+    <string name="applist_refresh_title">앱 리스트</string>
+    <string name="applist_refresh_msg">앱 다시 로드 중…</string>
+    <string name="applist_refresh_error_title">오류</string>
+    <string name="applist_refresh_error_msg">앱 리스트를 얻는데 실패함</string>
+    <string name="applist_quit_app">종료중</string>
+    <string name="applist_quit_success">종료됨</string>
+    <string name="applist_quit_fail">종료에 실패함</string>
+    <string name="applist_quit_confirmation">실행되고 있는 앱을 종료하길 원하시나요? 모든 저장되지 않은 데이터가 삭제됩니다</string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">고급 설정으로 PC 추가</string>
+    <string name="msg_add_pc">PC에 연결 중…</string>
+    <string name="addpc_fail">지정된 컴퓨터에 연결하는 데에 실패했습니다. PC의 방화벽과 적절한 포트 설정을 확인하세요.</string>
+    <string name="addpc_success">컴퓨터 추가 성공</string>
+    <string name="addpc_unknown_host">PC의 IP주소를 확인할 수 없습니다. Make sure you didn\'t make a typo in the address.</string>
+    <string name="addpc_enter_ip">반드시 IP주소를 입력해야 합니다.</string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings">기본 설정</string>
+    <string name="title_resolution_list">해상도와 FPS 타겟 지정</string>
+    <string name="summary_resolution_list">세팅 값이 자신의 PC 성능보다 너무 높으면 렉이나 깨짐을 유발할 수 있습니다.</string>
+    <string name="title_seekbar_bitrate">비트레이트 타겟 지정</string>
+    <string name="summary_seekbar_bitrate">낮은 비트레이트는 끊김을 줄이고, 높은 비트레이트는 품질을 높입니다.</string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
+    <string name="title_checkbox_stretch_video">전체 화면으로 렌더링 스크린 늘이기</string>
+    <string name="title_checkbox_disable_warnings">경고 메세지 끄기</string>
+    <string name="summary_checkbox_disable_warnings">화면 상의 연결 경고 메세지를 스트리밍 중에 비활성화합니다.</string>
+
+    <string name="category_audio_settings">오디오 설정</string>
+    <string name="title_checkbox_51_surround">5.1 서라운드 사운드 활성화</string>
+    <string name="summary_checkbox_51_surround">오디오 문제가 발생한다면 체크를 해제하세요. GFE 2.7이나 그 이상 버전이 필요합니다.</string>
+
+    <string name="category_gamepad_settings">게임패드 설정</string>
+    <string name="title_checkbox_multi_controller">다중 컨트롤러 지원</string>
+    <string name="summary_checkbox_multi_controller">이 옵션을 선택하지 않으면 모든 컨트롤러가 하나로 표시됩니다</string>
+    <string name="title_seekbar_deadzone">아날로그 스틱 데드존 설정</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Xbox 360/One 컨트롤러 드라이버</string>
+    <string name="summary_checkbox_xb1_driver">네이티브 Xbox 컨트롤러 지원 없이 빌드인 USB드라이버를 활성화합니다.</string>
+
+    <string name="category_on_screen_controls_settings">화면 상의 컨트롤 설정</string>
+    <string name="title_checkbox_show_onscreen_controls">화면 위에 컨트롤러 표시</string>
+    <string name="summary_checkbox_show_onscreen_controls">터치스크린에 가상 컨트롤러 오버레이를 표시합니다.</string>
+
+    <string name="category_ui_settings">UI 설정</string>
+    <string name="title_language_list">언어</string>
+    <string name="summary_language_list">Moonlight에서 사용할 언어를 선택합니다.</string>
+    <string name="title_checkbox_list_mode">그리드(바둑판) 대신 리스트 뷰 사용</string>
+    <string name="summary_checkbox_list_mode">그리드 대신 리스트로 앱과 PC를 표시합니다.</string>
+    <string name="title_checkbox_small_icon_mode">작은 아이콘 사용</string>
+    <string name="summary_checkbox_small_icon_mode">더 많이 표시하기 위해 그리드 표시에서 작은 아이콘을 사용합니다.</string>
+
+    <string name="category_host_settings">호스트 설정</string>
+    <string name="title_checkbox_enable_sops">게임 설정 최적화</string>
+    <string name="summary_checkbox_enable_sops">최적의 스트리밍을 위해 Geforce Experience가 게임 설정을 수정하도록 허용합니다.</string>
+    <string name="title_checkbox_host_audio">PC에서 소리 재생</string>
+    <string name="summary_checkbox_host_audio">이 장치와 컴퓨터에서 소리를 재생합니다.</string>
+
+    <string name="category_advanced_settings">고급 설정</string>
+    <string name="title_video_format">H.265 설정 변경</string>
+    <string name="summary_video_format">H.265는 비디오 대역폭 요구사항을 낮춰주지만 최신 장치가 필요합니다.</string>
+
+</resources>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string-array name="resolution_names">
+    <item>720p 30 FPS</item>
+    <item>720p 60 FPS</item>
+    <item>1080p 30 FPS</item>
+    <item>1080p 60 FPS</item>
+    <item>4K 30 FPS</item>
+    <item>4K 60 FPS</item>
+  </string-array>
+
+  <string-array name="decoder_names">
+    <item>Selecteer Decoder Automatisch</item>
+    <item>Forceer Software Decoderen</item>
+    <item>Forceer Hardware Decoderen</item>
+  </string-array>
+
+  <string-array name="video_format_names">
+    <item>Gebruik H.265 alleen als het stabiel is.</item>
+    <item>Gebruik H.265 altijd (mogelijkheid tot crashes)</item>
+    <item>Gebruik H.265 nooit</item>
+  </string-array>
+</resources>
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <!-- PC view menu entries -->
+  <string name="pcview_menu_app_list">Toon Spel Lijst</string>
+  <string name="pcview_menu_pair_pc">Koppel met PC</string>
+  <string name="pcview_menu_unpair_pc">Ontkoppelen</string>
+  <string name="pcview_menu_send_wol">Stuur Wake-On-LAN aanvraag</string>
+  <string name="pcview_menu_delete_pc">Verwijder PC</string>
+
+  <!-- Pair messages -->
+  <string name="pairing">Koppelen…</string>
+  <string name="pair_pc_offline">Computer is onbereikbaar</string>
+  <string name="pair_pc_ingame">Computer is op dit moment in een spel. Sluit het spel voordat je koppelt.</string>
+  <string name="pair_pairing_title">Koppelen</string>
+  <string name="pair_pairing_msg">Voer de volgende PIN in op de doel PC:</string>
+  <string name="pair_incorrect_pin">Ongeldige PIN</string>
+  <string name="pair_fail">Koppelen mislukt</string>
+
+  <!-- WOL messages -->
+  <string name="wol_pc_online">Computer is online</string>
+  <string name="wol_no_mac">Het is niet mogelijk om de PC uit slaapstand te halen, omdat GFE geen MAC adres heeft verstuurd.</string>
+  <string name="wol_waking_pc">PC uit slaapstand halen…</string>
+  <string name="wol_waking_msg"> Het kan even duren voordat de PC reageert.
+    Als dit niet gebeurt controleer de Wake-On-LAN instellingen.
+  </string>
+  <string name="wol_fail">Wake-On-LAN packets versturen mislukt</string>
+
+  <!-- Unpair messages -->
+  <string name="unpairing">Ontkoppelen…</string>
+  <string name="unpair_success">Ontkoppeling succesvol</string>
+  <string name="unpair_fail">Ontkoppeling mislukt</string>
+  <string name="unpair_error">Apparaat niet gekoppeld</string>
+
+  <!-- Errors -->
+  <string name="error_pc_offline">Computer is offline</string>
+  <string name="error_manager_not_running">De ComputerManager service is niet gestart. Wacht een ogenblik of herstart de app.</string>
+  <string name="error_unknown_host">Host achterhalen mislukt.</string>
+  <string name="error_404">GFE geeft een HTTP 404 fout. Kijk na of de PC een ondersteunde GPU heeft.
+    Remote desktop software kan soms ook voor deze fout zorgen. Probeer de computer opnieuw op te starten of GFE te herinstalleren.
+  </string>
+
+  <!-- Start application messages -->
+  <string name="conn_establishing_title">Verbinding maken</string>
+  <string name="conn_establishing_msg">Verbinding starten</string>
+  <string name="conn_metered">Waarschuwing: Actieve internet verbinding bevat een datalimiet!</string>
+  <string name="conn_client_latency">Gemiddelde frame decoding reactietijd:</string>
+  <string name="conn_client_latency_hw">hardware decoder reactietijd:</string>
+  <string name="conn_hardware_latency">Gemiddelde hardware decoding reactietijd:</string>
+  <string name="conn_starting">Starten</string>
+  <string name="conn_error_title">Verbindingsprobleem</string>
+  <string name="conn_error_msg">Starten mislukt</string>
+  <string name="conn_terminated_title">Verbinding beëindigd</string>
+  <string name="conn_terminated_msg">De verbinding is beëindigd</string>
+
+  <!-- General strings -->
+  <string name="ip_hint">IP adres van GeForce PC</string>
+  <string name="searching_pc">Zoeken naar PCs met GeForce Experience actief…</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nee</string>
+  <string name="lost_connection">Verbinding met PC verloren</string>
+
+  <!-- AppList activity -->
+  <string name="title_applist">Apps op</string>
+  <string name="applist_menu_resume">Hervat Sessie</string>
+  <string name="applist_menu_quit">Stop Sessie</string>
+  <string name="applist_menu_quit_and_start">Stop Huidige Spel en Start</string>
+  <string name="applist_menu_cancel">Annuleer</string>
+  <string name="applist_refresh_title">App Lijst</string>
+  <string name="applist_refresh_msg">Apps Verversen…</string>
+  <string name="applist_refresh_error_title">Fout</string>
+  <string name="applist_refresh_error_msg">App lijst ophalen mislukt</string>
+  <string name="applist_quit_app">Stoppen</string>
+  <string name="applist_quit_success">Succesvol gestopt.</string>
+  <string name="applist_quit_fail">Stoppen mislukt</string>
+  <string name="applist_quit_confirmation">Weet je het zeker dat je de app wilt sluiten? Alle niet-opgeslagen gegevens gaan verloren.</string>
+
+  <!-- Add computer manually activity -->
+  <string name="title_add_pc">Voeg handmatig PC toe</string>
+  <string name="msg_add_pc">Verbinding maken met PC…</string>
+  <string name="addpc_fail">Verbinden mislukt. Controleer of de benodigde poorten openstaan in de firewall.</string>
+  <string name="addpc_success">Computer toevoegen succesvol</string>
+  <string name="addpc_unknown_host">Adres achterhalen is mislukt. Controleer het ingevoerde adres op typfouten.</string>
+  <string name="addpc_enter_ip">IP-adres invoeren is verplicht.</string>
+
+  <!-- Preferences -->
+  <string name="category_basic_settings">Algemene Instellingen</string>
+  <string name="title_resolution_list">Selecteer resolutie en FPS doel</string>
+  <string name="summary_resolution_list">Te hoge instellingen kunnen crashes en haperingen veroorzaken.</string>
+  <string name="title_seekbar_bitrate">Selecteer doel video bitsnelheid</string>
+  <string name="summary_seekbar_bitrate">Verlaag bitsnelheid om haperingen te verminderen. Verhoog de bitsnelheid voor een betere videokwaliteit.</string>
+  <string name="suffix_seekbar_bitrate">Mbps</string>
+  <string name="title_checkbox_stretch_video">Rek video uit tot volledig scherm</string>
+  <string name="title_checkbox_disable_warnings">Verberg waarschuwingsberichten</string>
+  <string name="summary_checkbox_disable_warnings">Verberg on-screen verbindingswaarschuwingen tijdens het streamen</string>
+
+  <string name="category_audio_settings">Geluidsinstellingen</string>
+  <string name="title_checkbox_51_surround">Gebruik 5.1 surround sound</string>
+  <string name="summary_checkbox_51_surround">Gebruik dit niet als er problemen zijn met de audio. Vereist GFE 2.7 of hoger.</string>
+
+  <string name="category_gamepad_settings">Gamepad Instellingen</string>
+  <string name="title_checkbox_multi_controller">Multi-gamepad support</string>
+  <string name="summary_checkbox_multi_controller">Wanneer uitgevinkt, alle controllers verschijnen als één.</string>
+  <string name="title_seekbar_deadzone">Pas analoge dodezone aan.</string>
+  <string name="suffix_seekbar_deadzone">%</string>
+  <string name="title_checkbox_xb1_driver">Xbox 360/One controller stuurprogramma</string>
+  <string name="summary_checkbox_xb1_driver">Gebruikt de ingebouwde USB stuurprogramma voor apparaten zonder Xbox controller ondersteuning.</string>
+
+  <string name="category_on_screen_controls_settings">On-screen Controller Instellingen</string>
+  <string name="title_checkbox_show_onscreen_controls">Laat on-screen controls zien</string>
+  <string name="summary_checkbox_show_onscreen_controls">Geeft een virtuele controller weer op het touchscreen.</string>
+
+  <string name="category_ui_settings">UI Installingen</string>
+  <string name="title_language_list">Taal</string>
+  <string name="summary_language_list">Taal te gebruiken in Moonlight</string>
+  <string name="title_checkbox_list_mode">Gebruik lijsten in plaats van kolommen</string>
+  <string name="summary_checkbox_list_mode">Display apps and PCs in lists instead of grids</string>
+  <string name="title_checkbox_small_icon_mode">Gebruik kleine iconen</string>
+  <string name="summary_checkbox_small_icon_mode">Gebruik kleine iconen in kolom onderdelen zodat meer items tegelijk zichtbaar worden.</string>
+
+  <string name="category_host_settings">Host Instellingen</string>
+  <string name="title_checkbox_enable_sops">Optimaliseer spel instellingen</string>
+  <string name="summary_checkbox_enable_sops">Sta GFE toe om spel instellingen te veranderen voor een optimale stream</string>
+  <string name="title_checkbox_host_audio">Speel audio af op PC</string>
+  <string name="summary_checkbox_host_audio">Speel audio af op de computer en op dit apparaat</string>
+
+  <string name="category_advanced_settings">Geavanceerde Instellingen</string>
+  <string name="title_video_format">Verander H.265 instellingen</string>
+  <string name="summary_video_format">H.265 verlaagt video bandbreedte vereisten maar benodigdt een recent apparaat.</string>
+
+</resources>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="decoder_names">
+        <item>Автоматический выбор декодера</item>
+        <item>Принудительное программное декодирование</item>
+        <item>Принудительное аппаратное декодирование</item>
+    </string-array>
+
+    <string-array name="video_format_names">
+        <item>Использовать H.265 только если безопасно</item>
+        <item>Всегда использовать H.265 если доступно</item>
+        <item>Никогда не использовать H.265</item>
+    </string-array>
+</resources>
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">Посмотреть список игр</string>
+    <string name="pcview_menu_pair_pc">Создать пару с PC</string>
+    <string name="pcview_menu_unpair_pc">Разорвать пару</string>
+    <string name="pcview_menu_send_wol">Отправить Wake-On-LAN запрос</string>
+    <string name="pcview_menu_delete_pc">Удалить PC</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">Создание пары…</string>
+    <string name="pair_pc_offline">Компьютер выключен или находится не в сети</string>
+    <string name="pair_pc_ingame">Компьютер в данный момент находится в игре. Вы должны закрыть игру перед создание пары.</string>
+    <string name="pair_pairing_title">Создание пары</string>
+    <string name="pair_pairing_msg">Пожалуйста введите этот PIN на PC:</string>
+    <string name="pair_incorrect_pin">Неправильный PIN</string>
+    <string name="pair_fail">Создание пары не удалось</string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online">Компьютер в сети</string>
+    <string name="wol_no_mac">Невозможно разбудить PC потому что GFE не отправило MAC адрес</string>
+    <string name="wol_waking_pc">Пробуждение PC…</string>
+    <string name="wol_waking_msg">Пробуждение PC может занять несколько секунд.
+	    Если этого не происходит, удостоверьтесь что Wake-On-LAN настроен правильно.
+    </string>
+    <string name="wol_fail">Ошибка при отправке Wake-On-LAN пакетов</string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing">Разрыв пары…</string>
+    <string name="unpair_success">Разрыв пары закончился успешно.</string>
+    <string name="unpair_fail">Разрыв пары не удался</string>
+    <string name="unpair_error">Устройство не было спарено</string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline">Компьютер выключен или находится не в сети</string>
+    <string name="error_manager_not_running">Сервис ComputerManager не запущен. Пожалуйста, подождите несколько секунд или перезапустите приложение.</string>
+    <string name="error_unknown_host">Не удалось найти хост</string>
+    <string name="error_404">GFE вернул ошибку HTTP 404. Убедитесь что ваш PC is испольщует поддерживаемый GPU.
+	    Использование программ для удалённого доступа также можнт вызывать эту ошибку. Попробуйте перезагрузить компьютер или переустановить GFE.
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">Создание соединения.</string>
+    <string name="conn_establishing_msg">Подключение</string>
+    <string name="conn_metered">Внимание: Происходит измерение вашего сетевого соединения!</string>
+    <string name="conn_client_latency">Средняя задержка декодирования кадра: </string>
+    <string name="conn_client_latency_hw">задержка аппаратного декодирования:</string>
+    <string name="conn_hardware_latency">Средняя задержка апаратного декодирования:</string>
+    <string name="conn_starting">Запуск</string>
+    <string name="conn_error_title">Ошибка соединения</string>
+    <string name="conn_error_msg">Запуск не удался</string>
+    <string name="conn_terminated_title">Соединение прекращено</string>
+    <string name="conn_terminated_msg">Подключение было прервано</string>
+
+    <!-- General strings -->
+    <string name="ip_hint">IP адресс компьютера с GeForce</string>
+    <string name="searching_pc">Поиск компьютеров…</string>
+    <string name="yes">Да</string>
+    <string name="no">Нет</string>
+    <string name="lost_connection">Потеряно соединение с PC</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">Приложения на</string>
+    <string name="applist_menu_resume">Возобновить сессию</string>
+    <string name="applist_menu_quit">Выйти из сессии</string>
+    <string name="applist_menu_quit_and_start">Выйти из текущей игры и запустить</string>
+    <string name="applist_menu_cancel">Отмена</string>
+    <string name="applist_refresh_title">Список приложений</string>
+    <string name="applist_refresh_msg">Обновление приложений…</string>
+    <string name="applist_refresh_error_title">Ошибка</string>
+    <string name="applist_refresh_error_msg">Ошибка при получении списка приложений</string>
+    <string name="applist_quit_app">Выход из</string>
+    <string name="applist_quit_success">Выход произошёл успешно из</string>
+    <string name="applist_quit_fail">Ошибка при выходе</string>
+    <string name="applist_quit_confirmation">Вы уверены, что хотите выйти из запущенного приложения? Все несохраненные данные будут потеряны.</string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">Добавление PC вручную</string>
+    <string name="msg_add_pc">Соединение с PC…</string>
+    <string name="addpc_fail">Не удалось подключиться к выбранному компьютеру. Удостоверьтесь, что необходимые порты разрешены в настройках брандмауэра.</string>
+    <string name="addpc_success">Компьютер добавлен успешно.</string>
+    <string name="addpc_unknown_host">Не удалось найти PC по указанному адресу. Убедитесь, что вы не совершили ошибок во время его написания.</string>
+    <string name="addpc_enter_ip">Вы должны ввести IP адрес</string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings">Базовые Настройки</string>
+    <string name="title_resolution_list">Выберите разрешение и частоту кадров.</string>
+    <string name="summary_resolution_list">Выбор слишком высокого значеня для своего устройства может вызвать тормоза или вылеты.</string>
+    <string name="title_seekbar_bitrate">Выберите битрейт видео.</string>
+    <string name="summary_seekbar_bitrate">Низкий битрейт уменьшит зависания. Увеличение битрейта улучшит качество изображения.</string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
+    <string name="title_checkbox_stretch_video">Растягивать видео на весь экран</string>
+    <string name="title_checkbox_disable_warnings">Отключить сообщения с предупреждениями</string>
+    <string name="summary_checkbox_disable_warnings">Выключить экранные предупреждения о соединении во время стрима.</string>
+
+    <string name="category_audio_settings">Аудио Настройки</string>
+    <string name="title_checkbox_51_surround">Включить объёмный звук 5.1</string>
+    <string name="summary_checkbox_51_surround">Отключите, если появляются аудио проблемы. Требуется GFE 2.7 или выше.</string>
+
+    <string name="category_gamepad_settings">Настройки Гемпада</string>
+    <string name="title_checkbox_multi_controller">Поддержка нескольких контроллеров</string>
+    <string name="summary_checkbox_multi_controller">Когда отключена, все контроллеры определяются как один. </string>
+    <string name="title_seekbar_deadzone">Регулировать мертвую зону аналогового стика.</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Драйвер контроллера от Xbox One</string>
+    <string name="summary_checkbox_xb1_driver">Включить встроенный USB драйвер для устройств без встроенной поддержки контроллера от Xbox One.</string>
+
+    <string name="category_ui_settings">Настройки Интерфейса</string>
+    <string name="title_language_list">Язык</string>
+    <string name="summary_language_list">Язык, который будет использоваться в Moonlight</string>
+    <string name="title_checkbox_list_mode">Использовать списки вместо сеток.</string>
+    <string name="summary_checkbox_list_mode">Выводить приложения и компьютеры списком, вместо использования сетки.</string>
+    <string name="title_checkbox_small_icon_mode">Использовать маленькие иконки</string>
+    <string name="summary_checkbox_small_icon_mode">Использовать маленькие иконки в сетки для увеличения числа элементов, отображаемых на экране.</string>
+
+    <string name="category_host_settings">Настройки Хоста</string>
+    <string name="title_checkbox_enable_sops">Оптимизировать игровые настройки</string>
+    <string name="summary_checkbox_enable_sops">Разрешить GFE изменять настройки игр для оптимальной потоковой передачи</string>
+    <string name="title_checkbox_host_audio">Проигрывать звук на PC</string>
+    <string name="summary_checkbox_host_audio">Проигрывать звук на компьютере и текущем устройстве.</string>
+
+    <string name="category_advanced_settings">Расширенные Настройки</string>
+    <string name="title_video_format">Изменить настройки H.265</string>
+    <string name="summary_video_format">H.265 снижает требования к пропускной способности, но требует очень свежих устройств.</string>
+
+</resources>
@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+      Use a black background to avoid the transparent background when switching apps.
+      android:windowBackgroundFallback is supposed to do this, but it wasn't working for
+      me as of Android 7.1
+    -->
+    <style name="StreamBaseTheme" parent="AppBaseTheme">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
+</resources>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+   <string-array name="decoder_names">
+        <item>自动选择解码器</item>
+        <item>强制软解</item>
+        <item>强制硬解</item>
+        </string-array>
+
+	 <string-array name="video_format_names">
+        <item>如果稳定才使用H.265</item>
+        <item>强制使用H.265（不稳定）</item>
+        <item>不使用H.265</item>
+    </string-array>
+</resources>
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Shortcut strings -->
+    <string name="scut_deleted_pc"> 电脑已删除 </string>
+    <string name="scut_not_paired"> 电脑没有配对成功 </string>
+
+    <!-- Help strings -->
+    <string name="help_loading_title"> 帮助查看器 </string>
+    <string name="help_loading_msg"> 加载帮助页面中…… </string>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list"> 浏览游戏列表 </string>
+    <string name="pcview_menu_pair_pc"> 和电脑配对 </string>
+    <string name="pcview_menu_unpair_pc"> 取消配对 </string>
+    <string name="pcview_menu_send_wol"> 发送 Wake-On-LAN 请求 </string>
+    <string name="pcview_menu_delete_pc"> 删除电脑 </string>
+
+    <!-- Pair messages -->
+    <string name="pairing"> 配对中…… </string>
+    <string name="pair_pc_offline"> 电脑离线中 </string>
+    <string name="pair_pc_ingame"> 电脑正在游戏中，你必须在配对之前先退出游戏 </string>
+    <string name="pair_pairing_title"> 配对中 </string>
+    <string name="pair_pairing_msg"> 请在目标电脑上输入以下的PIN码： </string>
+    <string name="pair_incorrect_pin"> PIN码错误 </string>
+    <string name="pair_fail"> 配对失败 </string>
+    <string name="pair_already_in_progress"> 已经在配对中，请稍等 </string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online"> 电脑在线中 </string>
+    <string name="wol_no_mac"> 由于GeForce Experience没有发送MAC地址过来因此无法唤醒电脑 </string>
+    <string name="wol_waking_pc"> 唤醒电脑中…… </string>
+    <string name="wol_waking_msg"> 远程唤醒电脑需要一些时间\n\n
+    	如果电脑没有唤醒，请确保Wake-On-LAN的设置无误
+    </string>
+    <string name="wol_fail"> 无法发送Wake-On-LAN数据包 </string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing"> 取消配对中…… </string>
+    <string name="unpair_success"> 成功取消配对 </string>
+    <string name="unpair_fail"> 无法配对 </string>
+    <string name="unpair_error"> 设备没有配对过 </string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline"> 电脑离线中 </string>
+    <string name="error_manager_not_running">ComputerManager服务不在运行中\n\n请稍等几秒或者直接重启Moonlight</string>
+    <string name="error_unknown_host"> 无法解析电脑地址 </string>
+    <string name="error_404"> GeForce Experience返回了HTTP 404 错误。确保你的显卡支持GAMESTREAM\n\n
+	    使用远程控制软件同样会引起此错误，请尝试重启电脑或者重新安装GeForce Experience
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title"> 建立连接中 </string>
+    <string name="conn_establishing_msg"> 启动连接中 </string>
+    <string name="conn_metered"> 警告: 你正在使用移动网络，继续使用将会产生大量流量费用！ </string>
+    <string name="conn_client_latency"> 每帧解码平均延迟:</string>
+    <string name="conn_client_latency_hw"> 硬解码器延迟:</string>
+    <string name="conn_hardware_latency"> 硬解码器平均延迟:</string>
+    <string name="conn_starting"> 启动中…… </string>
+    <string name="conn_error_title"> 连接错误 </string>
+    <string name="conn_error_msg"> 启动失败 </string>
+    <string name="conn_terminated_title"> 连接被终结 </string>
+    <string name="conn_terminated_msg"> 连接已被终结 </string>
+
+    <!-- General strings -->
+    <string name="ip_hint"> 串流电脑的IP地址 </string>
+    <string name="searching_pc"> 正在搜寻运行着GAMESTREAM的电脑…… \n\n
+        确保GeForce Experience里面SHIELD选项里面的GAMESTREAM开关是开着的 </string>
+    <string name="yes"> 是 </string>
+    <string name="no"> 否 </string>
+    <string name="lost_connection"> 失去了与电脑的连接 </string>
+    <string name="help">帮助</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">Apps on</string>
+    <string name="applist_connect_msg"> 连接到电脑中…… </string>
+    <string name="applist_menu_resume"> 恢复串流 </string>
+    <string name="applist_menu_quit"> 退出串流 </string>
+    <string name="applist_menu_quit_and_start"> 退出当前游戏并开始这个游戏 </string>
+    <string name="applist_menu_cancel"> 取消 </string>
+    <string name="applist_refresh_title"> 游戏列表 </string>
+    <string name="applist_refresh_msg"> 刷新中…… </string>
+    <string name="applist_refresh_error_title"> 错误 </string>
+    <string name="applist_refresh_error_msg"> 获取列表失败 </string>
+    <string name="applist_quit_app"> 退出中 </string>
+    <string name="applist_quit_success"> 成功退出串流 </string>
+    <string name="applist_quit_fail"> 退出串流失败 </string>
+    <string name="applist_quit_confirmation"> 您确定要退出当前游戏？\n\n所有未保存的数据将丢失 </string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc"> 手动添加电脑 </string>
+    <string name="msg_add_pc"> 连接到电脑中…… </string>
+    <string name="addpc_fail"> 无法连接到指定的电脑。请确保指定的端口没有被防火墙阻止 </string>
+    <string name="addpc_success"> 成功添加电脑 </string>
+    <string name="addpc_unknown_host"> 无法解析电脑的IP地址，请确保IP地址输入无误 </string>
+    <string name="addpc_enter_ip"> 请输入一个IP地址！ </string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings"> 基本设置 </string>
+    <string name="title_resolution_list"> 选择目标分辨率和帧数 </string>
+    <string name="summary_resolution_list"> 过高的设定会引起串流卡顿甚至软件闪退 </string>
+    <string name="title_seekbar_bitrate"> 选择目标视频码率 </string>
+    <string name="summary_seekbar_bitrate"> 低码率减少卡顿，高码率提高画质 </string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
+    <string name="title_checkbox_stretch_video"> 将画面拉伸至全屏 </string>
+    <string name="title_checkbox_disable_warnings"> 禁用错误提示 </string>
+    <string name="summary_checkbox_disable_warnings"> 串流过程中禁用连接错误提示 </string>
+
+    <string name="category_audio_settings"> 音频设置 </string>
+    <string name="title_checkbox_51_surround"> 启用 5.1 环绕音效 </string>
+    <string name="summary_checkbox_51_surround"> 如果你的声音听起来有问题请禁用。\n\n需要GeForce Experience 2.7 或更高版本 </string>
+
+    <string name="category_gamepad_settings"> 手柄设置 </string>
+    <string name="title_checkbox_multi_controller"> 启用多手柄支持 </string>
+    <string name="summary_checkbox_multi_controller"> 如果禁用，所有手柄将会认作一个手柄 </string>
+    <string name="title_seekbar_deadzone"> 调整摇杆死区 </string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Xbox 360/One 手柄驱动 </string>
+    <string name="summary_checkbox_xb1_driver"> 若要在那些没有原生Xbox手柄驱动的设备上使用Xbox手柄，请勾上此复选框 </string>
+
+    <string name="category_on_screen_controls_settings"> 触屏设置 </string>
+    <string name="title_checkbox_show_onscreen_controls"> 启用虚拟手柄 </string>
+    <string name="summary_checkbox_show_onscreen_controls"> 将在串流画面上显示一层虚拟手柄 </string>
+
+    <string name="category_ui_settings"> 界面设置 </string>
+    <string name="title_language_list">语言</string>
+    <string name="summary_language_list"> 请选择您希望Moonlight使用的语言 </string>
+    <string name="title_checkbox_list_mode"> 使用列表代替图标 </string>
+    <string name="summary_checkbox_list_mode"> 将以列表来显示电脑和游戏 </string>
+    <string name="title_checkbox_small_icon_mode"> 使用小图标 </string>
+    <string name="summary_checkbox_small_icon_mode"> 使用小图标以在屏幕上显示更多项目 </string>
+
+    <string name="category_host_settings"> 主机设置 </string>
+    <string name="title_checkbox_enable_sops"> 优化游戏设置 </string>
+    <string name="summary_checkbox_enable_sops"> 允许GeForce Experience为最佳串流效果自动更改游戏设置 </string>
+    <string name="title_checkbox_host_audio"> 将声音输出到电脑上 </string>
+    <string name="summary_checkbox_host_audio"> 将在电脑和本设备同时输出声音 </string>
+
+    <string name="category_advanced_settings"> 高级设置 </string>
+    <string name="title_video_format"> H.265设置 </string>
+    <string name="summary_video_format">H.265能降低带宽需求，但是需要设备支持 </string>
+
+</resources>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+   <string-array name="decoder_names">
+        <item>自動選擇解碼器</item>
+        <item>強制軟解</item>
+        <item>強制硬解</item>
+        </string-array>
+
+	 <string-array name="video_format_names">
+        <item>如果穩定才使用H.265</item>
+        <item>強制使用H.265（不穩定）</item>
+        <item>不使用H.265</item>
+    </string-array>
+</resources>
--- a/Show More
+++ b/Show More