Update version

Italian translation: better wording

.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

.gitignore

@@ -1 +1,35 @@
-/bin/*
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
+
+# Compiled JNI libraries folder
+**/jniLibs

.metadata/.plugins/org.eclipse.cdt.core/.log

@@ -1,2 +0,0 @@
-*** SESSION Sep 21, 2013 18:55:11.17 -------------------------------------------
-*** SESSION Sep 21, 2013 18:55:55.08 -------------------------------------------

.metadata/.plugins/org.eclipse.cdt.make.core/specs.c

@@ -1 +0,0 @@
-

.metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp

@@ -1 +0,0 @@
-

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version

@@ -1 +0,0 @@
-

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version

@@ -1 +0,0 @@
-

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs

@@ -1,3 +0,0 @@
-com.android.ide.eclipse.adt.fixLegacyEditors=1
-com.android.ide.eclipse.adt.sdk=C\:\\Users\\Andrew\\Desktop\\ADT\\adt-bundle-windows-x86_64-20130917\\sdk
-eclipse.preferences.version=1

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-spelling_locale_initialized=true
-useAnnotationsPrefPage=true
-useQuickDiffPrefPage=true

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-version=1

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs

@@ -1,13 +0,0 @@
-content_assist_proposals_background=255,255,255
-content_assist_proposals_foreground=0,0,0
-eclipse.preferences.version=1
-fontPropagated=true
-org.eclipse.jdt.ui.editor.tab.width=
-org.eclipse.jdt.ui.formatterprofiles.version=12
-org.eclipse.jdt.ui.javadoclocations.migrated=true
-org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New;
-proposalOrderMigrated=true
-spelling_locale_initialized=true
-tabWidthPropagated=true
-useAnnotationsPrefPage=true
-useQuickDiffPrefPage=true

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs

@@ -1,5 +0,0 @@
-PROBLEMS_FILTERS_MIGRATE=true
-eclipse.preferences.version=1
-platformState=1379804095671
-quickStart=false
-tipsAndTricks=true

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-showIntro=false

.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<typeInfoHistroy/>

.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<qualifiedTypeNameHistroy/>

.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section name="Workbench">
-	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
-		<item value="true" key="group_libraries"/>
-		<item value="false" key="linkWithEditor"/>
-		<item value="2" key="layout"/>
-		<item value="1" key="rootMode"/>
-		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0D;&#x0A;&lt;xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;/customFilters&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
-	</section>
-	<section name="JavaElementSearchActions">
-	</section>
-</section>

.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section name="Workbench">
-	<section name="ChooseWorkspaceDialogSettings">
-		<item value="185" key="DIALOG_Y_ORIGIN"/>
-		<item value="381" key="DIALOG_X_ORIGIN"/>
-	</section>
-	<section name="WORKBENCH_SETTINGS">
-		<list key="ENABLED_TRANSFERS">
-		</list>
-	</section>
-	<section name="ExternalProjectImportWizard">
-		<item value="false" key="WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"/>
-		<item value="false" key="WizardProjectsImportPage.STORE_COPY_PROJECT_ID"/>
-	</section>
-</section>

.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section name="Workbench">
-	<section name="org.eclipse.ui.internal.QuickAccess">
-		<item value="1025" key="dialogWidth"/>
-		<item value="525" key="dialogHeight"/>
-		<list key="orderedProviders">
-		</list>
-		<list key="textArray">
-		</list>
-		<list key="orderedElements">
-		</list>
-		<list key="textEntries">
-		</list>
-	</section>
-	<section name="ImportExportAction">
-	</section>
-</section>

.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workingSetManager>
-<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1379804109849_0" label="Window Working Set" name="Aggregate for window 1379804109848"/>
-<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1379804153983_1" label="Window Working Set" name="Aggregate for window 1379804153983"/>
-</workingSetManager>

.metadata/version.ini

@@ -1 +0,0 @@
-org.eclipse.core.runtime=1

.project

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Limelight</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

README.md

@@ -1,12 +1,12 @@
 #Limelight
 
 Limelight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
-We reverse engineered the Shield streaming software, and created a version that can be run on any Android device.
+We reverse engineered the Shield streaming software and created a version that can be run on any Android device.
 
 Limelight will allow you to stream your full collection of games from your Windows PC to your Android device,
-in your own home, or over the internet.
+whether in your own home or over the internet.
 
-[Limelight-pc](https://github.com/limelight-stream/limelight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/limelight-stream/limelight-ios) and [Windows Phone](https://github.com/limelight-stream/limelight-wp) are also in development.
+[Limelight-pc](https://github.com/limelight-stream/limelight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/limelight-stream/limelight-ios) and [Windows and Windows Phone](https://github.com/limelight-stream/limelight-windows) are also in development.
 
 ##Features
 
@@ -14,9 +14,6 @@ in your own home, or over the internet.
 * Full gamepad support for MOGA, Xbox 360, PS3, OUYA, and Shield
 * Automatically finds GameStream-compatible PCs on your network
 
-##Features in development
-* Keyboard input
-
 ##Installation
 
 * Download and install Limelight for Android from
@@ -28,7 +25,6 @@ in your own home, or over the internet.
 * [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with GTX 600/700 series GPU
 * Android device running 4.1 (Jelly Bean) or higher
 * High-end wireless router (802.11n dual-band recommended)
-* Exynos/Snapdragon SoC __OR__ Quad-Core 1.4 GHz Cortex-A9 or higher (Tegra 3)
 
 ##Usage
 

app/app.iml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="limelight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <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/res/rs/nonRoot/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/resources" type="java-resource" />
+      <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$/build/generated/source/r/test/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/nonRoot/debug" type="java-test-resource" />
+      <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/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/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/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/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" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <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/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <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/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.51" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-r7" level="project" />
+    <orderEntry type="library" exported="" name="jmdns-fixed" level="project" />
+    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.51" level="project" />
+    <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="limelight-common" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="androidasync-e1dfb4" level="project" />
+    <orderEntry type="library" exported="" name="jcodec-0.1.9" level="project" />
+    <orderEntry type="library" exported="" name="ion-2f46fa" level="project" />
+  </component>
+</module>
+

app/build.gradle

@@ -0,0 +1,81 @@
+import com.android.builder.model.ProductFlavor
+import org.apache.tools.ant.taskdefs.condition.Os
+
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 21
+
+        versionName "3.0.2"
+        versionCode = 48
+    }
+
+    productFlavors {
+        root {
+            applicationId "com.limelight.root"
+        }
+
+        nonRoot {
+            applicationId "com.limelight"
+        }
+    }
+
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    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'
+        }
+    }
+
+    tasks.withType(JavaCompile) {
+        compileTask -> compileTask.dependsOn ndkBuild
+    }
+}
+
+dependencies {
+    compile group: 'org.jcodec', name: 'jcodec', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '+'
+    compile group: 'com.google.android', name: 'support-v4', version:'+'
+
+    // FIXME: Pending resolution of issue #346 using custom build
+    //compile group: 'com.koushikdutta.ion', name: 'ion', version:'+'
+    compile group: 'com.google.code.gson', name: 'gson', version:'+'
+    compile files('libs/androidasync-e1dfb4.jar')
+    compile files('libs/ion-2f46fa.jar')
+
+    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'+'
+    compile group: 'com.squareup.okio', name:'okio', version:'+'
+    compile files('libs/jmdns-fixed.jar')
+    compile files('libs/limelight-common.jar')
+    compile files('libs/tinyrtsp.jar')
+}

app/src/main/AndroidManifest.xml

@@ -1,12 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.limelight"
+    package="com.limelight">
-    android:versionCode="30"
-    android:versionName="2.5.3" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -16,67 +10,71 @@
     
     <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" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
         android:theme="@style/AppTheme" >
+        
+        <!-- Launcher for traditional devices -->
         <activity
-            android:name="com.limelight.PcView"
+            android:name=".PcView"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
-            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="tv.ouya.intent.category.APP" />
             </intent-filter>
         </activity>
+        
+        <!-- Launcher for Android TV devices -->
         <activity
-            android:name="com.limelight.AppView"
+            android:name=".PcViewTv"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:logo="@drawable/atv_banner"
-            android:label="App List" >
+            android:icon="@drawable/atv_banner"
+            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>
+        </activity>
+        
+        <activity
+            android:name=".AppView"
+            android:configChanges="mcc|mnc|locale|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="com.limelight.StreamSettings"
+            android:name=".preferences.StreamSettings"
             android:label="Streaming Settings" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
         <activity
-            android:name="com.limelight.AdvancedSettings"
+            android:name=".preferences.AddComputerManually"
-            android:label="Advanced Settings" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.StreamSettings" />
-        </activity>
-        <activity
-            android:name="com.limelight.AddComputerManually"
             android:label="Add Computer Manually" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
         <activity
-            android:name="com.limelight.Game"
+            android:name=".Game"
             android:screenOrientation="sensorLandscape"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:theme="@style/StreamTheme"
-            android:label="@string/title_activity_game"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
-            android:parentActivityName="com.limelight.Connection"
-            android:theme="@style/FullscreenTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.Connection" />
         </activity>
         <service
-            android:name="com.limelight.discovery.DiscoveryService"
+            android:name=".discovery.DiscoveryService"
             android:label="mDNS PC Auto-Discovery Service" />
         <service
-            android:name="com.limelight.computers.ComputerManagerService"
+            android:name=".computers.ComputerManagerService"
             android:label="Computer Management Service" />
     </application>
 

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

@@ -9,11 +9,13 @@ import java.util.List;
 import org.xmlpull.v1.XmlPullParserException;
 
 import com.limelight.binding.PlatformBinding;
+import com.limelight.grid.AppGridAdapter;
 import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.SpinnerDialog;
+import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -25,17 +27,17 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
+import android.widget.GridView;
-import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
 public class AppView extends Activity {
-	private ListView appList;
+    private AppGridAdapter appGridAdapter;
-	private ArrayAdapter<AppObject> appListAdapter;
 	private InetAddress ipAddress;
 	private String uniqueId;
 	private boolean remote;
+    private boolean firstLoad = true;
 	
 	private final static int RESUME_ID = 1;
 	private final static int QUIT_ID = 2;
@@ -50,47 +52,58 @@ public class AppView extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_app_view);
+
+        UiHelper.notifyNewRootView(this);
 		
 		byte[] address = getIntent().getByteArrayExtra(ADDRESS_EXTRA);
 		uniqueId = getIntent().getStringExtra(UNIQUEID_EXTRA);
 		remote = getIntent().getBooleanExtra(REMOTE_EXTRA, false);
 		if (address == null || uniqueId == null) {
+            finish();
 			return;
 		}
 		
-		setTitle("App List for "+getIntent().getStringExtra(NAME_EXTRA));
+		String labelText = getResources().getString(R.string.title_applist)+" "+getIntent().getStringExtra(NAME_EXTRA);
+		TextView label = (TextView) findViewById(R.id.appListText);
+		setTitle(labelText);
+		label.setText(labelText);
 		
 		try {
 			ipAddress = InetAddress.getByAddress(address);
 		} catch (UnknownHostException e) {
-			return;
+            e.printStackTrace();
+            finish();
+            return;
 		}
 		
 		// Setup the list view
-		appList = (ListView)findViewById(R.id.pcListView);
+        GridView appGrid = (GridView) findViewById(R.id.appGridView);
-		appListAdapter = new ArrayAdapter<AppObject>(this, R.layout.simplerow, R.id.rowTextView);
+        try {
-		appListAdapter.setNotifyOnChange(false);
+            appGridAdapter = new AppGridAdapter(this, ipAddress, uniqueId);
-		appList.setAdapter(appListAdapter);
+        } catch (Exception e) {
-		appList.setItemsCanFocus(true);
+            e.printStackTrace();
-		appList.setOnItemClickListener(new OnItemClickListener() {
+            finish();
-			@Override
+            return;
-			public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
+        }
-					long id) {
+        appGrid.setAdapter(appGridAdapter);
-				AppObject app = (AppObject) appListAdapter.getItem(pos);
+        appGrid.setOnItemClickListener(new OnItemClickListener() {
-				if (app == null || app.app == null) {
+            @Override
-					return;
+            public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
-				}
+                                    long id) {
-				
+                AppObject app = (AppObject) appGridAdapter.getItem(pos);
-				// Only open the context menu if something is running, otherwise start it
+                if (app == null || app.app == null) {
-				if (getRunningAppId() != -1) {
+                    return;
-					openContextMenu(arg1);
+                }
-				}
+
-				else {
+                // Only open the context menu if something is running, otherwise start it
-					doStart(app.app);
+                if (getRunningAppId() != -1) {
-				}
+                    openContextMenu(arg1);
-			}
+                } else {
-		});
+                    doStart(app.app);
-        registerForContextMenu(appList);
+                }
+            }
+        });
+        registerForContextMenu(appGrid);
 	}
 	
 	@Override
@@ -104,14 +117,18 @@ public class AppView extends Activity {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		
+
-        updateAppList();
+        // Display the error message if it was the
+        // first load, but just kill the activity
+        // on subsequent errors
+        updateAppList(firstLoad);
+        firstLoad = false;
 	}
 	
 	private int getRunningAppId() {
         int runningAppId = -1;
-        for (int i = 0; i < appListAdapter.getCount(); i++) {
+        for (int i = 0; i < appGridAdapter.getCount(); i++) {
-        	AppObject app = appListAdapter.getItem(i);
+        	AppObject app = (AppObject) appGridAdapter.getItem(i);
         	if (app.app == null) {
         		continue;
         	}
@@ -125,11 +142,11 @@ public class AppView extends Activity {
 	}
 	
 	@Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
 		super.onCreateContextMenu(menu, v, menuInfo);
         
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        AppObject selectedApp = (AppObject) appListAdapter.getItem(info.position);
+        AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
         if (selectedApp == null || selectedApp.app == null) {
         	return;
         }
@@ -137,12 +154,12 @@ public class AppView extends Activity {
         int runningAppId = getRunningAppId();
         if (runningAppId != -1) {
         	if (runningAppId == selectedApp.app.getAppId()) {
-                menu.add(Menu.NONE, RESUME_ID, 1, "Resume Session");
+                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
-                menu.add(Menu.NONE, QUIT_ID, 2, "Quit Session");
+                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
         	}
         	else {
-                menu.add(Menu.NONE, RESUME_ID, 1, "Quit Current Game and Start");
+                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_quit_and_start));
-                menu.add(Menu.NONE, CANCEL_ID, 2, "Cancel");
+                menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
         	}
         }
     }
@@ -154,41 +171,28 @@ public class AppView extends Activity {
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        AppObject app = (AppObject) appListAdapter.getItem(info.position);
+        AppObject app = (AppObject) appGridAdapter.getItem(info.position);
-        switch (item.getItemId())
+        switch (item.getItemId()) {
-        {
+            case RESUME_ID:
-        case RESUME_ID:
+                // Resume is the same as start for us
-        	// Resume is the same as start for us
+                doStart(app.app);
-        	doStart(app.app);
+                return true;
-        	return true;
+
-        	
+            case QUIT_ID:
-        case QUIT_ID:
+                doQuit(app.app);
-        	doQuit(app.app);
+                return true;
-        	return true;
+
-        	
+            case CANCEL_ID:
-        case CANCEL_ID:
+                return true;
-        	return true;
+
-        	
+            default:
-        default:
+                return super.onContextItemSelected(item);
-          return super.onContextItemSelected(item);
         }
     }
-
-    private static String generateString(NvApp app) {
-    	StringBuilder str = new StringBuilder();
-    	str.append(app.getAppName());
-    	if (app.getIsRunning()) {
-    		str.append(" - Running");
-    	}
-    	return str.toString();
-    }
     
-    private void addListPlaceholder() {
+    private void updateAppList(final boolean displayError) {
-        appListAdapter.add(new AppObject("No apps found. Try rescanning for games in GeForce Experience.", null));
+		final SpinnerDialog spinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.applist_refresh_title),
-    }
+				getResources().getString(R.string.applist_refresh_msg), true);
-    
-    private void updateAppList() {
-		final SpinnerDialog spinner = SpinnerDialog.displayDialog(this, "App List", "Refreshing app list...", true);
 		new Thread() {
 			@Override
 			public void run() {
@@ -200,30 +204,37 @@ public class AppView extends Activity {
 					AppView.this.runOnUiThread(new Runnable() {
 						@Override
 						public void run() {
-							appListAdapter.clear();
+                            appGridAdapter.clear();
-							if (appList.isEmpty()) {
+                            for (NvApp app : appList) {
-								addListPlaceholder();
+                                appGridAdapter.addApp(new AppObject(app));
-							}
+                            }
-							else {
+
-								for (NvApp app : appList) {
+                            appGridAdapter.notifyDataSetChanged();
-									appListAdapter.add(new AppObject(generateString(app), app));
-								}
-							}
-							
-							appListAdapter.notifyDataSetChanged();
 						}
 					});
 					
 					// Success case
 					return;
-				} catch (GfeHttpResponseException e) {
+				} catch (GfeHttpResponseException ignored) {
-				} catch (IOException e) {
+				} catch (IOException ignored) {
-				} catch (XmlPullParserException e) {
+				} catch (XmlPullParserException ignored) {
 				} finally {
 					spinner.dismiss();
 				}
-				
+
-				Dialog.displayDialog(AppView.this, "Error", "Failed to get app list", true);
+                if (displayError) {
+                    Dialog.displayDialog(AppView.this, getResources().getString(R.string.applist_refresh_error_title),
+                            getResources().getString(R.string.applist_refresh_error_msg), true);
+                }
+                else {
+                    // Just finish the activity immediately
+                    AppView.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            finish();
+                        }
+                    });
+                }
 			}
 		}.start();
     }
@@ -238,7 +249,7 @@ public class AppView extends Activity {
 	}
 	
 	private void doQuit(final NvApp app) {
-		Toast.makeText(AppView.this, "Quitting "+app.getAppName()+"...", Toast.LENGTH_SHORT).show();
+		Toast.makeText(AppView.this, getResources().getString(R.string.applist_quit_app)+" "+app.getAppName()+"...", Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
 			@Override
 			public void run() {
@@ -247,17 +258,16 @@ public class AppView extends Activity {
 				try {
 					httpConn = new NvHTTP(ipAddress, uniqueId, null,  PlatformBinding.getCryptoProvider(AppView.this));
 					if (httpConn.quitApp()) {
-						message = "Successfully quit "+app.getAppName();
+						message = getResources().getString(R.string.applist_quit_success)+" "+app.getAppName();
 					}
 					else {
-						message = "Failed to quit "+app.getAppName();
+						message = getResources().getString(R.string.applist_quit_fail)+" "+app.getAppName();
 					}
-					updateAppList();
+					updateAppList(true);
 				} catch (UnknownHostException e) {
-					message = "Failed to resolve host";
+					message = getResources().getString(R.string.error_unknown_host);
 				} catch (FileNotFoundException e) {
-					message = "GFE returned an HTTP 404 error. Make sure your PC is running a supported GPU. Using remote desktop software can also cause this error. "
+					message = getResources().getString(R.string.error_404);
-							+ "Try rebooting your machine or reinstalling GFE.";
 				} catch (Exception e) {
 					message = e.getMessage();
 				}
@@ -274,17 +284,15 @@ public class AppView extends Activity {
 	}
 	
 	public class AppObject {
-		public String text;
 		public NvApp app;
 		
-		public AppObject(String text, NvApp app) {
+		public AppObject(NvApp app) {
-			this.text = text;
 			this.app = app;
 		}
 		
 		@Override
 		public String toString() {
-			return text;
+			return app.getAppName();
 		}
 	}
-}
+}

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

@@ -0,0 +1,842 @@
+package com.limelight;
+
+
+import com.limelight.LimelightBuildProps;
+import com.limelight.binding.PlatformBinding;
+import com.limelight.binding.input.ControllerHandler;
+import com.limelight.binding.input.KeyboardTranslator;
+import com.limelight.binding.input.TouchContext;
+import com.limelight.binding.input.evdev.EvdevListener;
+import com.limelight.binding.input.evdev.EvdevWatcher;
+import com.limelight.binding.video.ConfigurableDecoderRenderer;
+import com.limelight.nvstream.NvConnection;
+import com.limelight.nvstream.NvConnectionListener;
+import com.limelight.nvstream.StreamConfiguration;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.input.KeyboardPacket;
+import com.limelight.nvstream.input.MouseButtonPacket;
+import com.limelight.preferences.PreferenceConfiguration;
+import com.limelight.utils.Dialog;
+import com.limelight.utils.SpinnerDialog;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Point;
+import android.media.AudioManager;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Display;
+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.Toast;
+
+
+public class Game extends Activity implements SurfaceHolder.Callback,
+	OnGenericMotionListener, OnTouchListener, NvConnectionListener, EvdevListener,
+	OnSystemUiVisibilityChangeListener
+{
+	private int lastMouseX = Integer.MIN_VALUE;
+	private int lastMouseY = Integer.MIN_VALUE;
+	private int lastButtonState = 0;
+	
+	// Only 2 touches are supported
+	private TouchContext[] touchContextMap = new TouchContext[2];
+	
+	private ControllerHandler controllerHandler;
+	private KeyboardTranslator keybTranslator;
+	
+	private PreferenceConfiguration prefConfig;
+	private 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 EvdevWatcher evdevWatcher;
+	private int modifierFlags = 0;
+	private boolean grabbedInput = true;
+	private boolean grabComboDown = false;
+	
+	private ConfigurableDecoderRenderer decoderRenderer;
+	
+	private WifiManager.WifiLock wifiLock;
+	
+	private int drFlags = 0;
+	
+	public static final String EXTRA_HOST = "Host";
+	public static final String EXTRA_APP = "App";
+	public static final String EXTRA_UNIQUEID = "UniqueId";
+	public static final String EXTRA_STREAMING_REMOTE = "Remote";
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		// We don't want a title bar
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		
+		// Full-screen and don't let the display go off
+		getWindow().addFlags(
+				WindowManager.LayoutParams.FLAG_FULLSCREEN |
+				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+		
+		// If we're going to use immersive mode, we want to have
+		// the entire screen
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+			getWindow().getDecorView().setSystemUiVisibility(
+					View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+			
+			getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+		}
+		
+		// Listen for UI visibility events
+		getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
+		
+		// Change volume button behavior
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
+		
+		// Inflate the content
+		setContentView(R.layout.activity_game);
+		
+		// Start the spinner
+		spinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.conn_establishing_title),
+				getResources().getString(R.string.conn_establishing_msg), true);
+		
+		// Read the stream preferences
+		prefConfig = PreferenceConfiguration.readPreferences(this);
+		switch (prefConfig.decoder) {
+		case PreferenceConfiguration.FORCE_SOFTWARE_DECODER:
+			drFlags |= VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING;
+			break;
+		case PreferenceConfiguration.AUTOSELECT_DECODER:
+			break;
+		case PreferenceConfiguration.FORCE_HARDWARE_DECODER:
+			drFlags |= VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING;
+			break;
+		}
+		
+		if (prefConfig.stretchVideo) {
+			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);
+		        
+		// 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);
+		wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Limelight");
+		wifiLock.setReferenceCounted(false);
+		wifiLock.acquire();
+		
+		String host = Game.this.getIntent().getStringExtra(EXTRA_HOST);
+		String app = Game.this.getIntent().getStringExtra(EXTRA_APP);
+		String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
+        boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
+		
+		decoderRenderer = new ConfigurableDecoderRenderer();
+		decoderRenderer.initializeWithFlags(drFlags);
+        
+		StreamConfiguration config = new StreamConfiguration.Builder()
+                .setResolution(prefConfig.width, prefConfig.height)
+                .setRefreshRate(prefConfig.fps)
+                .setApp(app)
+                .setBitrate(prefConfig.bitrate * 1000)
+                .setEnableSops(prefConfig.enableSops)
+                .enableAdaptiveResolution((decoderRenderer.getCapabilities() &
+                        VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION) != 0)
+                .enableLocalAudioPlayback(prefConfig.playHostAudio)
+                .setMaxPacketSize(remote ? 1024 : 1292)
+                .setRemote(remote)
+                .build();
+
+		// Initialize the connection
+		conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
+		keybTranslator = new KeyboardTranslator(conn);
+		controllerHandler = new ControllerHandler(conn, prefConfig.deadzonePercentage);
+		
+		SurfaceHolder sh = sv.getHolder();
+		if (prefConfig.stretchVideo || !decoderRenderer.isHardwareAccelerated()) {
+			// Set the surface to the size of the video
+			sh.setFixedSize(prefConfig.width, prefConfig.height);
+		}
+		
+		// Initialize touch contexts
+		for (int i = 0; i < touchContextMap.length; i++) {
+			touchContextMap[i] = new TouchContext(conn, i,
+                    ((double)prefConfig.width / (double)screenSize.x),
+                    ((double)prefConfig.height / (double)screenSize.y));
+		}
+		
+		if (LimelightBuildProps.ROOT_BUILD) {
+			// Start watching for raw input
+			evdevWatcher = new EvdevWatcher(this);
+			evdevWatcher.start();
+		}
+		
+		// The connection will be started when the surface gets created
+		sh.addCallback(this);
+	}
+	
+	private void resizeSurfaceWithAspectRatio(SurfaceView sv, double vidWidth, double vidHeight)
+	{
+		// Get the visible width of the activity
+	    double visibleWidth = getWindow().getDecorView().getWidth();
+	    
+	    ViewGroup.LayoutParams lp = sv.getLayoutParams();
+	    
+	    // Calculate the new size of the SurfaceView
+	    lp.width = (int) visibleWidth;
+	    lp.height = (int) ((vidHeight / vidWidth) * visibleWidth);
+
+	    // Apply the size change
+	    sv.setLayoutParams(lp);
+	}
+	
+	private void checkDataConnection()
+	{
+		ConnectivityManager mgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+		if (mgr.isActiveNetworkMetered()) {
+			displayTransientMessage(getResources().getString(R.string.conn_metered));
+		}
+	}
+
+	@SuppressLint("InlinedApi")
+	private Runnable hideSystemUi = new Runnable() {
+			@Override
+			public void run() {
+				// Use immersive mode on 4.4+ or standard low profile on previous builds
+				if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+					Game.this.getWindow().getDecorView().setSystemUiVisibility(
+							View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+							View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+							View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+							View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+							View.SYSTEM_UI_FLAG_FULLSCREEN |
+							View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+				}
+				else {
+					Game.this.getWindow().getDecorView().setSystemUiVisibility(
+							View.SYSTEM_UI_FLAG_FULLSCREEN |
+							View.SYSTEM_UI_FLAG_LOW_PROFILE);
+				}
+			}
+	};
+
+	private void hideSystemUi(int delay) {
+		Handler h = getWindow().getDecorView().getHandler();
+		if (h != null) {
+			h.removeCallbacks(hideSystemUi);
+			h.postDelayed(hideSystemUi, delay);               
+		}
+	}
+	
+	@Override
+	protected void onStop() {
+		super.onStop();
+		
+		SpinnerDialog.closeDialogs(this);
+		Dialog.closeDialogs();
+		
+		displayedFailureDialog = true;
+		stopConnection();
+		
+		int averageEndToEndLat = decoderRenderer.getAverageEndToEndLatency();
+		int averageDecoderLat = decoderRenderer.getAverageDecoderLatency();
+		String message = null;
+		if (averageEndToEndLat > 0) {
+			message = getResources().getString(R.string.conn_client_latency)+" "+averageEndToEndLat+" ms";
+			if (averageDecoderLat > 0) {
+				message += " ("+getResources().getString(R.string.conn_client_latency_hw)+" "+averageDecoderLat+" ms)";
+			}
+		}
+		else if (averageDecoderLat > 0) {
+			message = getResources().getString(R.string.conn_hardware_latency)+" "+averageDecoderLat+" ms";
+		}
+		
+		if (message != null) {
+			Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+		}
+
+		finish();
+	}
+	
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		wifiLock.release();
+	}
+	
+	private Runnable toggleGrab = new Runnable() {
+		@Override
+		public void run() {
+			
+			if (evdevWatcher != null) {
+				if (grabbedInput) {
+					evdevWatcher.ungrabAll();
+				}
+				else {
+					evdevWatcher.regrabAll();
+				}
+			}
+			
+			grabbedInput = !grabbedInput;
+		}
+	};
+	
+	// Returns true if the key stroke was consumed
+	private boolean handleSpecialKeys(short translatedKey, boolean down) {
+		int modifierMask = 0;
+		
+		// Mask off the high byte
+		translatedKey &= 0xff;
+		
+		if (translatedKey == KeyboardTranslator.VK_CONTROL) {
+			modifierMask = KeyboardPacket.MODIFIER_CTRL;
+		}
+		else if (translatedKey == KeyboardTranslator.VK_SHIFT) {
+			modifierMask = KeyboardPacket.MODIFIER_SHIFT;
+		}
+		else if (translatedKey == KeyboardTranslator.VK_ALT) {
+			modifierMask = KeyboardPacket.MODIFIER_ALT;
+		}
+		
+		if (down) {
+			this.modifierFlags |= modifierMask;
+		}
+		else {
+			this.modifierFlags &= ~modifierMask;
+		}
+		
+		// Check if Ctrl+Shift+Z is pressed
+		if (translatedKey == KeyboardTranslator.VK_Z &&
+			(modifierFlags & (KeyboardPacket.MODIFIER_CTRL | KeyboardPacket.MODIFIER_SHIFT)) ==
+				(KeyboardPacket.MODIFIER_CTRL | KeyboardPacket.MODIFIER_SHIFT))
+		{
+			if (down) {
+				// Now that we've pressed the magic combo
+				// we'll wait for one of the keys to come up
+				grabComboDown = true;
+			}
+			else {
+				// Toggle the grab if Z comes up
+				Handler h = getWindow().getDecorView().getHandler();
+				if (h != null) {
+					h.postDelayed(toggleGrab, 250);               
+				}
+				
+				grabComboDown = false;
+			}
+			
+			return true;
+		}
+		// Toggle the grab if control or shift comes up
+		else if (grabComboDown) {
+			Handler h = getWindow().getDecorView().getHandler();
+			if (h != null) {
+				h.postDelayed(toggleGrab, 250);               
+			}
+			
+			grabComboDown = false;
+			return true;
+		}
+		
+		// Not a special combo
+		return false;
+	}
+	
+	private static byte getModifierState(KeyEvent event) {
+		byte modifier = 0;
+		if (event.isShiftPressed()) {
+			modifier |= KeyboardPacket.MODIFIER_SHIFT;
+		}
+		if (event.isCtrlPressed()) {
+			modifier |= KeyboardPacket.MODIFIER_CTRL;
+		}
+		if (event.isAltPressed()) {
+			modifier |= KeyboardPacket.MODIFIER_ALT;
+		}
+		return modifier;
+	}
+	
+	private byte getModifierState() {
+		return (byte) modifierFlags;
+	}
+	
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		// Pass-through virtual navigation keys
+		if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
+			return super.onKeyDown(keyCode, event);
+		}
+		
+		// Try the controller handler first
+		boolean handled = controllerHandler.handleButtonDown(event);
+		if (!handled) {
+			// Try the keyboard handler
+			short translated = keybTranslator.translate(event.getKeyCode());
+			if (translated == 0) {
+				return super.onKeyDown(keyCode, event);
+			}
+			
+			// Let this method take duplicate key down events
+			if (handleSpecialKeys(translated, true)) {
+				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);
+			}
+			
+			keybTranslator.sendKeyDown(translated,
+					getModifierState(event));
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		// Pass-through virtual navigation keys
+		if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
+			return super.onKeyUp(keyCode, event);
+		}
+		
+		// Try the controller handler first
+		boolean handled = controllerHandler.handleButtonUp(event);
+		if (!handled) {
+			// Try the keyboard handler
+			short translated = keybTranslator.translate(event.getKeyCode());
+			if (translated == 0) {
+				return super.onKeyUp(keyCode, event);
+			}
+			
+			if (handleSpecialKeys(translated, false)) {
+				return true;
+			}
+			
+			// Pass through keyboard input if we're not grabbing
+			if (!grabbedInput) {
+				return super.onKeyUp(keyCode, event);
+			}
+			
+			keybTranslator.sendKeyUp(translated,
+					getModifierState(event));
+		}
+		
+		return true;
+	}
+	
+	private TouchContext getTouchContext(int actionIndex)
+	{	
+		if (actionIndex < touchContextMap.length) {
+			return touchContextMap[actionIndex];
+		}
+		else {
+			return null;
+		}
+	}
+
+	// Returns true if the event was consumed
+	private boolean handleMotionEvent(MotionEvent event) {
+		// Pass through keyboard input if we're not grabbing
+		if (!grabbedInput) {
+			return false;
+		}
+
+		if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+			if (controllerHandler.handleMotionEvent(event)) {
+				return true;
+			}		
+		}
+		else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0)
+		{
+			// This case is for touch-based input devices
+			if (event.getSource() == InputDevice.SOURCE_TOUCHSCREEN ||
+					event.getSource() == InputDevice.SOURCE_STYLUS)
+			{
+				int actionIndex = event.getActionIndex();
+
+				int eventX = (int)event.getX(actionIndex);
+				int eventY = (int)event.getY(actionIndex);
+
+				TouchContext context = getTouchContext(actionIndex);
+				if (context == null) {
+					return false;
+				}
+
+				switch (event.getActionMasked())
+				{
+				case MotionEvent.ACTION_POINTER_DOWN:
+				case MotionEvent.ACTION_DOWN:
+					context.touchDownEvent(eventX, eventY);
+					break;
+				case MotionEvent.ACTION_POINTER_UP:
+				case MotionEvent.ACTION_UP:
+					context.touchUpEvent(eventX, eventY);
+					if (actionIndex == 0 && event.getPointerCount() > 1) {
+						// The original secondary touch now becomes primary
+						context.touchDownEvent((int)event.getX(1), (int)event.getY(1));
+					}
+					break;
+				case MotionEvent.ACTION_MOVE:
+					// ACTION_MOVE is special because it always has actionIndex == 0
+					// We'll call the move handlers for all indexes manually
+
+                    // First process the historical events
+                    for (int i = 0; i < event.getHistorySize(); i++) {
+                        for (TouchContext aTouchContextMap : touchContextMap) {
+                            if (aTouchContextMap.getActionIndex() < event.getPointerCount())
+                            {
+                                aTouchContextMap.touchMoveEvent(
+                                        (int)event.getHistoricalX(aTouchContextMap.getActionIndex(), i),
+                                        (int)event.getHistoricalY(aTouchContextMap.getActionIndex(), i));
+                            }
+                        }
+                    }
+
+                    // Now process the current values
+                    for (TouchContext aTouchContextMap : touchContextMap) {
+                        if (aTouchContextMap.getActionIndex() < event.getPointerCount())
+                        {
+                            aTouchContextMap.touchMoveEvent(
+                                    (int)event.getX(aTouchContextMap.getActionIndex()),
+                                    (int)event.getY(aTouchContextMap.getActionIndex()));
+                        }
+                    }
+					break;
+				default:
+					return false;
+				}
+			}
+			// This case is for mice
+			else if (event.getSource() == InputDevice.SOURCE_MOUSE)
+			{
+				int changedButtons = event.getButtonState() ^ lastButtonState;
+				
+				if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
+					// Send the vertical scroll packet
+					byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
+					conn.sendMouseScroll(vScrollClicks);
+				}
+
+				if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
+					if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {
+						conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+					}
+					else {
+						conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+					}
+				}
+
+				if ((changedButtons & MotionEvent.BUTTON_SECONDARY) != 0) {
+					if ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
+						conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+					}
+					else {
+						conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+					}
+				}
+
+				if ((changedButtons & MotionEvent.BUTTON_TERTIARY) != 0) {
+					if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
+						conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_MIDDLE);
+					}
+					else {
+						conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_MIDDLE);
+					}
+				}
+
+                // 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();
+			}
+			else
+			{
+				// Unknown source
+				return false;
+			}
+
+			// Handled a known source
+			return true;
+		}
+
+		// Unknown class
+		return false;
+	}
+	
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+        return handleMotionEvent(event) || super.onTouchEvent(event);
+
+    }
+
+	@Override
+	public boolean onGenericMotionEvent(MotionEvent event) {
+        return handleMotionEvent(event) || super.onGenericMotionEvent(event);
+
+    }
+	
+	private void updateMousePosition(int eventX, int eventY) {
+		// Send a mouse move if we already have a mouse location
+		// and the mouse coordinates change
+		if (lastMouseX != Integer.MIN_VALUE &&
+			lastMouseY != Integer.MIN_VALUE &&
+			!(lastMouseX == eventX && lastMouseY == eventY))
+		{
+			int deltaX = eventX - lastMouseX;
+			int deltaY = eventY - lastMouseY;
+			
+			// Scale the deltas if the device resolution is different
+			// than the stream resolution
+			deltaX = (int)Math.round((double)deltaX * ((double)prefConfig.width / (double)screenSize.x));
+			deltaY = (int)Math.round((double)deltaY * ((double)prefConfig.height / (double)screenSize.y));
+			
+			conn.sendMouseMove((short)deltaX, (short)deltaY);
+		}
+		
+		// Update pointer location for delta calculation next time
+		lastMouseX = eventX;
+		lastMouseY = eventY;
+	}
+
+	@Override
+	public boolean onGenericMotion(View v, MotionEvent event) {
+		return handleMotionEvent(event);
+	}
+
+	@SuppressLint("ClickableViewAccessibility")
+	@Override
+	public boolean onTouch(View v, MotionEvent event) {
+		return handleMotionEvent(event);
+	}
+
+	@Override
+	public void stageStarting(Stage stage) {
+		if (spinner != null) {
+			spinner.setMessage(getResources().getString(R.string.conn_starting)+" "+stage.getName());
+		}
+	}
+
+	@Override
+	public void stageComplete(Stage stage) {
+	}
+	
+	private void stopConnection() {
+		if (connecting || connected) {
+			connecting = connected = false;
+			conn.stop();
+		}
+		
+		// Close the Evdev watcher to allow use of captured input devices
+		if (evdevWatcher != null) {
+			evdevWatcher.shutdown();
+			evdevWatcher = null;
+		}
+	}
+
+	@Override
+	public void stageFailed(Stage stage) {
+		if (spinner != null) {
+			spinner.dismiss();
+			spinner = null;
+		}
+
+		if (!displayedFailureDialog) {
+			displayedFailureDialog = true;
+			stopConnection();
+			Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title),
+					getResources().getString(R.string.conn_error_msg)+" "+stage.getName(), true);
+		}
+	}
+
+	@Override
+	public void connectionTerminated(Exception e) {
+		if (!displayedFailureDialog) {
+			displayedFailureDialog = true;
+			e.printStackTrace();
+			
+			stopConnection();
+			Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
+					getResources().getString(R.string.conn_terminated_msg), true);
+		}
+	}
+
+	@Override
+	public void connectionStarted() {
+		if (spinner != null) {
+			spinner.dismiss();
+			spinner = null;
+		}
+		
+		connecting = false;
+		connected = true;
+		
+		hideSystemUi(1000);
+	}
+
+	@Override
+	public void displayMessage(final String message) {
+		runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				Toast.makeText(Game.this, message, Toast.LENGTH_LONG).show();
+			}
+		});
+	}
+
+	@Override
+	public void displayTransientMessage(final String message) {
+		if (!prefConfig.disableWarnings) {
+			runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					Toast.makeText(Game.this, message, Toast.LENGTH_LONG).show();
+				}
+			});	
+		}
+	}
+
+	@Override
+	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+	}
+
+	@Override
+	public void surfaceCreated(SurfaceHolder holder) {
+		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 (!prefConfig.stretchVideo && decoderRenderer.isHardwareAccelerated()) {
+				resizeSurfaceWithAspectRatio((SurfaceView) findViewById(R.id.surfaceView),
+                        prefConfig.width, prefConfig.height);
+			}
+			
+			conn.start(PlatformBinding.getDeviceName(), holder, drFlags,
+					PlatformBinding.getAudioRenderer(), decoderRenderer);
+		}
+	}
+
+	@Override
+	public void surfaceDestroyed(SurfaceHolder holder) {
+		if (connected) {
+			stopConnection();
+		}
+	}
+
+	@Override
+	public void mouseMove(int deltaX, int deltaY) {
+		conn.sendMouseMove((short) deltaX, (short) deltaY);
+	}
+
+	@Override
+	public void mouseButtonEvent(int buttonId, boolean down) {
+		byte buttonIndex;
+		
+		switch (buttonId)
+		{
+		case EvdevListener.BUTTON_LEFT:
+			buttonIndex = MouseButtonPacket.BUTTON_LEFT;
+			break;
+		case EvdevListener.BUTTON_MIDDLE:
+			buttonIndex = MouseButtonPacket.BUTTON_MIDDLE;
+			break;
+		case EvdevListener.BUTTON_RIGHT:
+			buttonIndex = MouseButtonPacket.BUTTON_RIGHT;
+			break;
+		default:
+			LimeLog.warning("Unhandled button: "+buttonId);
+			return;
+		}
+		
+		if (down) {
+			conn.sendMouseButtonDown(buttonIndex);
+		}
+		else {
+			conn.sendMouseButtonUp(buttonIndex);
+		}
+	}
+
+	@Override
+	public void mouseScroll(byte amount) {
+		conn.sendMouseScroll(amount);
+	}
+
+	@Override
+	public void keyboardEvent(boolean buttonDown, short keyCode) {
+		short keyMap = keybTranslator.translate(keyCode);
+		if (keyMap != 0) {
+			if (handleSpecialKeys(keyMap, buttonDown)) {
+				return;
+			}
+			
+			if (buttonDown) {
+				keybTranslator.sendKeyDown(keyMap, getModifierState());
+			}
+			else {
+				keybTranslator.sendKeyUp(keyMap, getModifierState());
+			}
+		}
+	}
+
+	@Override
+	public void onSystemUiVisibilityChange(int visibility) {
+		// Don't do anything if we're not connected
+		if (!connected) {
+			return;
+		}
+		
+		// This flag is set for all devices
+		if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
+			hideSystemUi(2000);
+		}
+		// This flag is only set on 4.4+
+		else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT &&
+				 (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
+			hideSystemUi(2000);
+		}
+		// This flag is only set before 4.4+
+		else if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT &&
+				 (visibility & View.SYSTEM_UI_FLAG_LOW_PROFILE) == 0) {
+			hideSystemUi(2000);	 
+		}
+	}
+}

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

@@ -6,22 +6,29 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 import com.limelight.binding.PlatformBinding;
+import com.limelight.binding.crypto.AndroidCryptoProvider;
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
+import com.limelight.grid.PcGridAdapter;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.http.PairingManager.PairState;
 import com.limelight.nvstream.wol.WakeOnLanSender;
+import com.limelight.preferences.AddComputerManually;
+import com.limelight.preferences.StreamSettings;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -30,16 +37,15 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
+import android.widget.GridView;
-import android.widget.Button;
+import android.widget.ImageButton;
-import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
 public class PcView extends Activity {
-	private Button settingsButton, addComputerButton;
+    private RelativeLayout noPcFoundLayout;
-	private ListView pcList;
+    private PcGridAdapter pcGridAdapter;
-	private ArrayAdapter<ComputerObject> pcListAdapter;
 	private ComputerManagerService.ComputerManagerBinder managerBinder;
 	private boolean freezeUpdates, runningPolling;
 	private ServiceConnection serviceConnection = new ServiceConnection() {
@@ -59,6 +65,9 @@ public class PcView extends Activity {
 					
 					// Start updates
 					startComputerUpdates();
+					
+					// Force a keypair to be generated early to avoid discovery delays
+					new AndroidCryptoProvider(PcView.this).getClientCertificate();
 				}
 			}.start();
 		}
@@ -68,68 +77,87 @@ public class PcView extends Activity {
 		}
 	};
 	
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		
+		// Reinitialize views just in case orientation changed
+		initializeViews();
+	}
+	
 	private final static int APP_LIST_ID = 1;
 	private final static int PAIR_ID = 2;
 	private final static int UNPAIR_ID = 3;
 	private final static int WOL_ID = 4;
 	private final static int DELETE_ID = 5;
 	
+	private void initializeViews() {
+		setContentView(R.layout.activity_pc_view);
+
+        UiHelper.notifyNewRootView(this);
+
+        // Set default preferences if we've never been run
+        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+
+		// Setup the list view
+        ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
+        ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
+
+        GridView pcGrid = (GridView) findViewById(R.id.pcGridView);
+        pcGrid.setAdapter(pcGridAdapter);
+        pcGrid.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
+                                    long id) {
+                ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(pos);
+                if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
+                    // Do nothing
+                } else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
+                    // Open the context menu if a PC is offline
+                    openContextMenu(arg1);
+                } else if (computer.details.pairState != PairState.PAIRED) {
+                    // Pair an unpaired machine by default
+                    doPair(computer.details);
+                } else {
+                    doAppList(computer.details);
+                }
+            }
+        });
+		registerForContextMenu(pcGrid);
+		settingsButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(PcView.this, StreamSettings.class));
+            }
+        });
+		addComputerButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(PcView.this, AddComputerManually.class);
+                startActivity(i);
+            }
+        });
+
+        noPcFoundLayout = (RelativeLayout) findViewById(R.id.no_pc_found_layout);
+        if (pcGridAdapter.getCount() == 0) {
+            noPcFoundLayout.setVisibility(View.VISIBLE);
+        }
+        else {
+            noPcFoundLayout.setVisibility(View.INVISIBLE);
+        }
+        pcGridAdapter.notifyDataSetChanged();
+    }
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_pc_view);
 		
 		// Bind to the computer manager service
 		bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
 				Service.BIND_AUTO_CREATE);
-		
-		// Setup the list view
-		settingsButton = (Button)findViewById(R.id.settingsButton);
-		addComputerButton = (Button)findViewById(R.id.manuallyAddPc);
 
-		pcList = (ListView)findViewById(R.id.pcListView);
+        pcGridAdapter = new PcGridAdapter(this);
-		pcListAdapter = new ArrayAdapter<ComputerObject>(this, R.layout.simplerow, R.id.rowTextView);
+		
-		pcListAdapter.setNotifyOnChange(false);
+		initializeViews();
-        pcList.setAdapter(pcListAdapter);
-        pcList.setItemsCanFocus(true);
-        pcList.setOnItemClickListener(new OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
-					long id) {
-		        ComputerObject computer = (ComputerObject) pcListAdapter.getItem(pos);
-		        if (computer.details == null) {
-		        	// Placeholder item; no context menu for it
-		        	return;
-		        }
-		        else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-		        	// Open the context menu if a PC is offline
-					openContextMenu(arg1);
-		        }
-		        else if (computer.details.pairState != PairState.PAIRED) {
-		        	// Pair an unpaired machine by default
-		            doPair(computer.details);
-		        }
-		        else {
-		            doAppList(computer.details);
-		        }
-			}
-        });
-        registerForContextMenu(pcList);
-        settingsButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				startActivity(new Intent(PcView.this, StreamSettings.class));
-			}
-        });
-		addComputerButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				Intent i = new Intent(PcView.this, AddComputerManually.class);
-				startActivity(i);
-			}
-		});
-        
-        addListPlaceholder();
 	}
 	
 	private void startComputerUpdates() {
@@ -146,7 +174,7 @@ public class PcView extends Activity {
 						PcView.this.runOnUiThread(new Runnable() {
 							@Override
 							public void run() {
-								updateListView(details);
+								updateComputer(details);
 							}
 						});
 					}
@@ -156,7 +184,7 @@ public class PcView extends Activity {
 		}
 	}
 	
-	private void stopComputerUpdates() {
+	private void stopComputerUpdates(boolean wait) {
 		if (managerBinder != null) {
 			if (!runningPolling) {
 				return;
@@ -165,6 +193,11 @@ public class PcView extends Activity {
 			freezeUpdates = true;
 			
 			managerBinder.stopPolling();
+			
+			if (wait) {
+				managerBinder.waitForPollingStopped();
+			}
+			
 			runningPolling = false;
 		}
 	}
@@ -189,7 +222,7 @@ public class PcView extends Activity {
 	protected void onPause() {
 		super.onPause();
 		
-		stopComputerUpdates();
+		stopComputerUpdates(false);
 	}
 	
 	@Override
@@ -200,33 +233,32 @@ public class PcView extends Activity {
 	}
 	
 	@Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-		stopComputerUpdates();
+		stopComputerUpdates(false);
 		
 		// Call superclass
 		super.onCreateContextMenu(menu, v, menuInfo);
                 
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        ComputerObject computer = (ComputerObject) pcListAdapter.getItem(info.position);
+        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        if (computer == null || computer.details == null) {
+        if (computer == null || computer.details == null ||
+                computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
         	startComputerUpdates();
         	return;
         }
         
         // Inflate the context menu
         if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-            menu.add(Menu.NONE, WOL_ID, 1, "Send Wake-On-LAN request");
+            menu.add(Menu.NONE, WOL_ID, 1, getResources().getString(R.string.pcview_menu_send_wol));
-            menu.add(Menu.NONE, DELETE_ID, 2, "Delete PC");
+            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
         }
         else if (computer.details.pairState != PairState.PAIRED) {
-            menu.add(Menu.NONE, PAIR_ID, 1, "Pair with PC");
+            menu.add(Menu.NONE, PAIR_ID, 1, getResources().getString(R.string.pcview_menu_pair_pc));
-            if (computer.details.reachability == ComputerDetails.Reachability.REMOTE) {
+            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
-                menu.add(Menu.NONE, DELETE_ID, 2, "Delete PC");
-            }
         }
         else {
-            menu.add(Menu.NONE, APP_LIST_ID, 1, "View Game List");
+            menu.add(Menu.NONE, APP_LIST_ID, 1, getResources().getString(R.string.pcview_menu_app_list));
-            menu.add(Menu.NONE, UNPAIR_ID, 2, "Unpair");
+            menu.add(Menu.NONE, UNPAIR_ID, 2, getResources().getString(R.string.pcview_menu_unpair_pc));
         }
     }
 	
@@ -237,27 +269,29 @@ public class PcView extends Activity {
 	
 	private void doPair(final ComputerDetails computer) {
 		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, "Computer is offline", Toast.LENGTH_SHORT).show();
+			Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
 			return;
 		}
 		if (computer.runningGameId != 0) {
-			Toast.makeText(PcView.this, "Computer is currently in a game. " +
+			Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_ingame), Toast.LENGTH_LONG).show();
-					"You must close the game before pairing.", Toast.LENGTH_LONG).show();
 			return;
 		}
 		if (managerBinder == null) {
-			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
 			return;
 		}
 		
-		Toast.makeText(PcView.this, "Pairing...", Toast.LENGTH_SHORT).show();
+		Toast.makeText(PcView.this, getResources().getString(R.string.pairing), Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
 			@Override
 			public void run() {
 				NvHTTP httpConn;
 				String message;
+                boolean success = false;
 				try {
+					// Stop updates and wait while pairing
+					stopComputerUpdates(true);
+					
 					InetAddress addr = null;
 					if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
 						addr = computer.localIp;
@@ -271,23 +305,28 @@ public class PcView extends Activity {
 							PlatformBinding.getDeviceName(), 
 							PlatformBinding.getCryptoProvider(PcView.this));
 					if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
-						message = "Already paired";
+                        // Don't display any toast, but open the app list
+						message = null;
+                        success = true;
 					}
 					else {
 						final String pinStr = PairingManager.generatePinString();
 						
 						// Spin the dialog off in a thread because it blocks
-						Dialog.displayDialog(PcView.this, "Pairing", "Please enter the following PIN on the target PC: "+pinStr, false);
+						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);
 						if (pairState == PairingManager.PairState.PIN_WRONG) {
-							message = "Incorrect PIN";
+							message = getResources().getString(R.string.pair_incorrect_pin);
 						}
 						else if (pairState == PairingManager.PairState.FAILED) {
-							message = "Pairing failed";
+							message = getResources().getString(R.string.pair_fail);
 						}
 						else if (pairState == PairingManager.PairState.PAIRED) {
-							message = "Paired successfully";
+                            // Just navigate to the app view without displaying a toast
+                            message = null;
+                            success = true;
 						}
 						else {
 							// Should be no other values
@@ -295,49 +334,59 @@ public class PcView extends Activity {
 						}
 					}
 				} catch (UnknownHostException e) {
-					message = "Failed to resolve host";
+					message = getResources().getString(R.string.error_unknown_host);
 				} catch (FileNotFoundException e) {
-					message = "GFE returned an HTTP 404 error. Make sure your PC is running a supported GPU. Using remote desktop software can also cause this error. "
+					message = getResources().getString(R.string.error_404);
-							+ "Try rebooting your machine or reinstalling GFE.";
 				} catch (Exception e) {
+                    e.printStackTrace();
 					message = e.getMessage();
 				}
 				
 				Dialog.closeDialogs();
 				
 				final String toastMessage = message;
+                final boolean toastSuccess = success;
 				runOnUiThread(new Runnable() {
 					@Override
 					public void run() {
-						Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
+                        if (toastMessage != null) {
+                            Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
+                        }
+
+                        if (toastSuccess) {
+                            // Open the app list after a successful pairing attemp
+                            doAppList(computer);
+                        }
 					}
 				});
+				
+				// Start polling again
+				startComputerUpdates();
 			}
 		}).start();
 	}
 	
 	private void doWakeOnLan(final ComputerDetails computer) {
 		if (computer.reachability != ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, "Computer is online", Toast.LENGTH_SHORT).show();
+			Toast.makeText(PcView.this, getResources().getString(R.string.wol_pc_online), Toast.LENGTH_SHORT).show();
 			return;
 		}
 		
 		if (computer.macAddress == null) {
-			Toast.makeText(PcView.this, "Unable to wake PC because GFE didn't send a MAC address", Toast.LENGTH_SHORT).show();
+			Toast.makeText(PcView.this, getResources().getString(R.string.wol_no_mac), Toast.LENGTH_SHORT).show();
 			return;
 		}
 		
-		Toast.makeText(PcView.this, "Waking PC...", Toast.LENGTH_SHORT).show();
+		Toast.makeText(PcView.this, getResources().getString(R.string.wol_waking_pc), Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
 			@Override
 			public void run() {
 				String message;
 				try {
 					WakeOnLanSender.sendWolPacket(computer);
-					message = "It may take a few seconds for your PC to wake up. " +
+					message = getResources().getString(R.string.wol_waking_msg);
-							"If it doesn't, make sure it's configured properly for Wake-On-LAN.";
 				} catch (IOException e) {
-					message = "Failed to send Wake-On-LAN packets";
+					message = getResources().getString(R.string.wol_fail);
 				}
 				
 				final String toastMessage = message;
@@ -353,16 +402,15 @@ public class PcView extends Activity {
 	
 	private void doUnpair(final ComputerDetails computer) {
 		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, "Computer is offline", Toast.LENGTH_SHORT).show();
+			Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
 			return;
 		}
 		if (managerBinder == null) {
-			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
 			return;
 		}
 		
-		Toast.makeText(PcView.this, "Unpairing...", Toast.LENGTH_SHORT).show();
+		Toast.makeText(PcView.this, getResources().getString(R.string.unpairing), Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
 			@Override
 			public void run() {
@@ -384,20 +432,19 @@ public class PcView extends Activity {
 					if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
 						httpConn.unpair();
 						if (httpConn.getPairState() == PairingManager.PairState.NOT_PAIRED) {
-							message = "Unpaired successfully";
+							message = getResources().getString(R.string.unpair_success);
 						}
 						else {
-							message = "Failed to unpair";
+							message = getResources().getString(R.string.unpair_fail);
 						}
 					}
 					else {
-						message = "Device was not paired";
+						message = getResources().getString(R.string.unpair_error);
 					}
 				} catch (UnknownHostException e) {
-					message = "Failed to resolve host";
+					message = getResources().getString(R.string.error_unknown_host);
 				} catch (FileNotFoundException e) {
-					message = "GFE returned an HTTP 404 error. Make sure your PC is running a supported GPU. Using remote desktop software can also cause this error. "
+					message = getResources().getString(R.string.error_404);
-							+ "Try rebooting your machine or reinstalling GFE.";
 				} catch (Exception e) {
 					message = e.getMessage();
 				}
@@ -415,12 +462,11 @@ public class PcView extends Activity {
 	
 	private void doAppList(ComputerDetails computer) {
 		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, "Computer is offline", Toast.LENGTH_SHORT).show();
+			Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
 			return;
 		}
 		if (managerBinder == null) {
-			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
 			return;
 		}
 		
@@ -442,7 +488,7 @@ public class PcView extends Activity {
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        ComputerObject computer = (ComputerObject) pcListAdapter.getItem(info.position);
+        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
         switch (item.getItemId())
         {
         case PAIR_ID:
@@ -459,12 +505,11 @@ public class PcView extends Activity {
         	
         case DELETE_ID:
     		if (managerBinder == null) {
-    			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+    			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-    					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
     			return true;
     		}
         	managerBinder.removeComputer(computer.details.name);
-        	removeListView(computer.details);
+        	removeComputer(computer.details);
         	return true;
         	
         case APP_LIST_ID:
@@ -475,71 +520,24 @@ public class PcView extends Activity {
           return super.onContextItemSelected(item);
         }
     }
-
-    private static String generateString(ComputerDetails details) {
-    	StringBuilder str = new StringBuilder();
-    	str.append(details.name).append(" - ");
-    	if (details.state == ComputerDetails.State.ONLINE) {
-    		str.append("Online ");
-    		if (details.reachability == ComputerDetails.Reachability.LOCAL) {
-    			str.append("(Local) - ");
-    		}
-    		else {
-    			str.append("(Remote) - ");
-    		}
-    		if (details.pairState == PairState.PAIRED) {
-    			if (details.runningGameId == 0) {
-    				str.append("Available");
-    			}
-    			else {
-    				str.append("In Game");
-    			}
-    		}
-    		else {
-    			str.append("Not Paired");
-    		}
-    	}
-    	else {
-    		str.append("Offline");
-    	}
-    	return str.toString();
-    }
     
-    private void addListPlaceholder() {
+    private void removeComputer(ComputerDetails details) {
-        pcListAdapter.add(new ComputerObject("Discovery is running. No computers found yet. " +
+		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-        		"If your PC doesn't show up in about 15 seconds, " +
+			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-        		"make sure your computer is running GFE or add your PC manually using the button above.", null));
-    }
-    
-    private void removeListView(ComputerDetails details) {
-		for (int i = 0; i < pcListAdapter.getCount(); i++) {
-			ComputerObject computer = pcListAdapter.getItem(i);
 			
 			if (details.equals(computer.details)) {
-				pcListAdapter.remove(computer);
+                pcGridAdapter.removeComputer(computer);
+                pcGridAdapter.notifyDataSetChanged();
 				break;
 			}
 		}
-		
-		if (pcListAdapter.getCount() == 0) {
-			// Add the placeholder if we're down to 0 computers
-			addListPlaceholder();
-		}
     }
     
-	private void updateListView(ComputerDetails details) {
+	private void updateComputer(ComputerDetails details) {
-		String computerString = generateString(details);
 		ComputerObject existingEntry = null;
-		boolean placeholderPresent = false;
 		
-		for (int i = 0; i < pcListAdapter.getCount(); i++) {
+		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-			ComputerObject computer = pcListAdapter.getItem(i);
+			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-			
-			// If there's a placeholder, there's nothing else
-			if (computer.details == null) {
-				placeholderPresent = true;
-				break;
-			}
 			
 			// Check if this is the same computer
 			if (details.equals(computer.details)) {
@@ -550,35 +548,30 @@ public class PcView extends Activity {
 		
 		if (existingEntry != null) {
 			// Replace the information in the existing entry
-			existingEntry.text = computerString;
 			existingEntry.details = details;
 		}
 		else {
-			// If the placeholder is the only object, remove it
-			if (placeholderPresent) {
-				pcListAdapter.remove(pcListAdapter.getItem(0));
-			}
-			
 			// Add a new entry
-			pcListAdapter.add(new ComputerObject(computerString, details));
+            pcGridAdapter.addComputer(new ComputerObject(details));
+
+            // Remove the "Discovery in progress" view
+            noPcFoundLayout.setVisibility(View.INVISIBLE);
 		}
-		
+
-		// Notify the view that the data has changed
+        // Notify the view that the data has changed
-		pcListAdapter.notifyDataSetChanged();
+        pcGridAdapter.notifyDataSetChanged();
 	}
 	
 	public class ComputerObject {
-		public String text;
 		public ComputerDetails details;
 		
-		public ComputerObject(String text, ComputerDetails details) {
+		public ComputerObject(ComputerDetails details) {
-			this.text = text;
 			this.details = details;
 		}
 		
 		@Override
 		public String toString() {
-			return text;
+			return details.name;
 		}
 	}
 }

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

@@ -0,0 +1,6 @@
+package com.limelight;
+
+/* This is a dummy class to allow for a separate icon
+ * and launcher for TV.
+ */
+public class PcViewTv extends PcView {}

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

@@ -0,0 +1,97 @@
+package com.limelight.binding.audio;
+
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.av.audio.AudioRenderer;
+
+public class AndroidAudioRenderer implements AudioRenderer {
+
+	public static final int FRAME_SIZE = 960;
+	
+	private AudioTrack track;
+
+	@Override
+	public boolean streamInitialized(int channelCount, int sampleRate) {
+		int channelConfig;
+		int bufferSize;
+
+		switch (channelCount)
+		{
+		case 1:
+			channelConfig = AudioFormat.CHANNEL_OUT_MONO;
+			break;
+		case 2:
+			channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+			break;
+		default:
+			LimeLog.severe("Decoder returned unhandled channel count");
+			return false;
+		}
+
+        // We're not supposed to request less than the minimum
+        // buffer size for our buffer, but it appears that we can
+        // do this on many devices and it lowers audio latency.
+        // We'll try the small buffer size first and if it fails,
+        // use the recommended larger buffer size.
+        try {
+            // Buffer two frames of audio if possible
+            bufferSize = FRAME_SIZE * 2;
+
+            track = new AudioTrack(AudioManager.STREAM_MUSIC,
+                    sampleRate,
+                    channelConfig,
+                    AudioFormat.ENCODING_PCM_16BIT,
+                    bufferSize,
+                    AudioTrack.MODE_STREAM);
+            track.play();
+        } catch (Exception e) {
+            // Try to release the AudioTrack if we got far enough
+            try {
+                if (track != null) {
+                    track.release();
+                }
+            } catch (Exception ignored) {}
+
+            // Now try the larger buffer size
+            bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
+                            channelConfig,
+                            AudioFormat.ENCODING_PCM_16BIT),
+                    FRAME_SIZE * 2);
+
+            // Round to next frame
+            bufferSize = (((bufferSize + (FRAME_SIZE - 1)) / FRAME_SIZE) * FRAME_SIZE);
+
+            track = new AudioTrack(AudioManager.STREAM_MUSIC,
+                    sampleRate,
+                    channelConfig,
+                    AudioFormat.ENCODING_PCM_16BIT,
+                    bufferSize,
+                    AudioTrack.MODE_STREAM);
+            track.play();
+        }
+		
+		LimeLog.info("Audio track buffer size: "+bufferSize);
+
+		return true;
+	}
+
+	@Override
+	public void playDecodedAudio(byte[] audioData, int offset, int length) {
+		track.write(audioData, offset, length);
+	}
+
+	@Override
+	public void streamClosing() {
+		if (track != null) {
+			track.release();
+		}
+	}
+
+	@Override
+	public int getCapabilities() {
+		return 0;
+	}
+}

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

@@ -23,15 +23,16 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x500.X500NameBuilder;
 import org.bouncycastle.asn1.x500.style.BCStyle;
+import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.X509v3CertificateBuilder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 
@@ -51,6 +52,8 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 	private RSAPrivateKey key;
 	private byte[] pemCertBytes;
 	
+	private static final Object globalCryptoLock = new Object();
+	
 	static {
 		// Install the Bouncy Castle provider
 		Security.addProvider(new BouncyCastleProvider());
@@ -71,7 +74,10 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 		try {
 			FileInputStream fin = new FileInputStream(f);
 			byte[] fileData = new byte[(int) f.length()];
-			fin.read(fileData);
+			if (fin.read(fileData) != f.length()) {
+                // Failed to read
+                fileData = null;
+            }
 			fin.close();
 			return fileData;
 		} catch (IOException e) {
@@ -150,7 +156,8 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 		nameBuilder.addRDN(BCStyle.CN, "NVIDIA GameStream Client");
 		X500Name name = nameBuilder.build();
 		
-		X509v3CertificateBuilder certBuilder = new JcaX509v3CertificateBuilder(name, serial, now, expirationDate, name, keyPair.getPublic());
+		X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(name, serial, now, expirationDate, Locale.ENGLISH, name,
+			SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()));
 				
 		try {
 			ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BouncyCastleProvider.PROVIDER_NAME).build(keyPair.getPrivate());
@@ -177,7 +184,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 			
 			// Write the certificate in OpenSSL PEM format (important for the server)
 			StringWriter strWriter = new StringWriter();
-			PEMWriter pemWriter = new PEMWriter(strWriter);
+			JcaPEMWriter pemWriter = new JcaPEMWriter(strWriter);
 			pemWriter.writeObject(cert);
 			pemWriter.close();
 			
@@ -208,7 +215,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 	public X509Certificate getClientCertificate() {
 		// Use a lock here to ensure only one guy will be generating or loading
 		// the certificate and key at a time
-		synchronized (this) {
+		synchronized (globalCryptoLock) {
 			// Return a loaded cert if we have one
 			if (cert != null) {
 				return cert;
@@ -235,7 +242,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 	public RSAPrivateKey getClientPrivateKey() {
 		// Use a lock here to ensure only one guy will be generating or loading
 		// the certificate and key at a time
-		synchronized (this) {
+		synchronized (globalCryptoLock) {
 			// Return a loaded key if we have one
 			if (key != null) {
 				return key;
@@ -260,7 +267,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 	}
 	
 	public byte[] getPemEncodedClientCertificate() {
-		synchronized (this) {
+		synchronized (globalCryptoLock) {
 			// Call our helper function to do the cert loading/generation for us
 			getClientCertificate();
 			

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

@@ -0,0 +1,731 @@
+package com.limelight.binding.input;
+
+import java.util.HashMap;
+
+import android.os.SystemClock;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.NvConnection;
+import com.limelight.nvstream.input.ControllerPacket;
+import com.limelight.utils.Vector2d;
+
+public class ControllerHandler {
+	private short inputMap = 0x0000;
+	private byte leftTrigger = 0x00;
+	private byte rightTrigger = 0x00;
+	private short rightStickX = 0x0000;
+	private short rightStickY = 0x0000;
+	private short leftStickX = 0x0000;
+	private short leftStickY = 0x0000;
+	private int emulatingButtonFlags = 0;
+	
+	// Used for OUYA bumper state tracking since they force all buttons
+	// up when the OUYA button goes down. We watch the last time we get
+	// a bumper up and compare that to our maximum delay when we receive
+	// a Start button press to see if we should activate one of our 
+	// emulated button combos.
+	private long lastLbUpTime = 0;
+	private long lastRbUpTime = 0;
+	private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
+	
+	private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
+	
+	private static final int EMULATING_SPECIAL = 0x1;
+	private static final int EMULATING_SELECT = 0x2;
+	
+	private static final int EMULATED_SPECIAL_UP_DELAY_MS = 100;
+	private static final int EMULATED_SELECT_UP_DELAY_MS = 30;
+	
+	private Vector2d inputVector = new Vector2d();
+	
+	private HashMap<String, ControllerMapping> mappings = new HashMap<String, ControllerMapping>();
+	
+	private NvConnection conn;
+    private double stickDeadzone;
+    private final ControllerMapping defaultMapping = new ControllerMapping();
+    private boolean hasGameController;
+	
+	public ControllerHandler(NvConnection conn, int deadzonePercentage) {
+		this.conn = conn;
+
+        // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
+        // is required for controller batching support to work.
+        deadzonePercentage = 10;
+
+        int[] ids = InputDevice.getDeviceIds();
+        for (int i = 0; i < ids.length; i++) {
+            InputDevice dev = InputDevice.getDevice(ids[i]);
+            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 ||
+                    (dev.getSources() & InputDevice.SOURCE_GAMEPAD) != 0) {
+                // This looks like a gamepad, but we'll check X and Y to be sure
+                if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) != null &&
+                    getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) != null) {
+                    // This is a gamepad
+                    hasGameController = true;
+                }
+            }
+        }
+
+        // 1% is the lowest possible deadzone we support
+        if (deadzonePercentage <= 0) {
+            deadzonePercentage = 1;
+        }
+
+        this.stickDeadzone = (double)deadzonePercentage / 100.0;
+
+        // Initialize the default mapping for events with no device
+        defaultMapping.leftStickXAxis = MotionEvent.AXIS_X;
+        defaultMapping.leftStickYAxis = MotionEvent.AXIS_Y;
+        defaultMapping.leftStickDeadzoneRadius = (float) stickDeadzone;
+        defaultMapping.rightStickXAxis = MotionEvent.AXIS_Z;
+        defaultMapping.rightStickYAxis = MotionEvent.AXIS_RZ;
+        defaultMapping.rightStickDeadzoneRadius = (float) stickDeadzone;
+        defaultMapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+        defaultMapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
+	}
+	
+	private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
+		InputDevice.MotionRange range;
+		
+		// First get the axis for SOURCE_JOYSTICK
+		range = dev.getMotionRange(axis, InputDevice.SOURCE_JOYSTICK);
+		if (range == null) {
+			// Now try the axis for SOURCE_GAMEPAD
+			range = dev.getMotionRange(axis, InputDevice.SOURCE_GAMEPAD);
+		}
+		
+		return range;
+	}
+	
+	private ControllerMapping createMappingForDevice(InputDevice dev) {
+		ControllerMapping mapping = new ControllerMapping();
+        String devName = dev.getName();
+
+        LimeLog.info("Creating controller mapping for device: "+devName);
+
+        mapping.leftStickXAxis = MotionEvent.AXIS_X;
+		mapping.leftStickYAxis = MotionEvent.AXIS_Y;
+        if (getMotionRangeForJoystickAxis(dev, mapping.leftStickXAxis) != null &&
+                getMotionRangeForJoystickAxis(dev, mapping.leftStickYAxis) != null) {
+            // This is a gamepad
+            hasGameController = true;
+            mapping.hasJoystickAxes = true;
+        }
+		
+		InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER);
+		InputDevice.MotionRange rightTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RTRIGGER);
+		InputDevice.MotionRange brakeRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_BRAKE);
+		InputDevice.MotionRange gasRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_GAS);
+		if (leftTriggerRange != null && rightTriggerRange != null)
+		{
+			// Some controllers use LTRIGGER and RTRIGGER (like Ouya)
+			mapping.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
+			mapping.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
+		}
+		else if (brakeRange != null && gasRange != null)
+		{
+			// Others use GAS and BRAKE (like Moga)
+			mapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+			mapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
+		}
+		else
+		{
+			InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
+			InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
+			if (rxRange != null && ryRange != null && devName != null) {
+				if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
+					// Xbox controllers use RX and RY for right stick
+					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
+					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
+					
+					// Xbox controllers use Z and RZ for triggers
+					mapping.leftTriggerAxis = MotionEvent.AXIS_Z;
+					mapping.rightTriggerAxis = MotionEvent.AXIS_RZ;
+					mapping.triggersIdleNegative = true;
+					mapping.isXboxController = true;
+				}
+				else {
+					// DS4 controller uses RX and RY for triggers
+					mapping.leftTriggerAxis = MotionEvent.AXIS_RX;
+					mapping.rightTriggerAxis = MotionEvent.AXIS_RY;
+					mapping.triggersIdleNegative = true;
+					
+					mapping.isDualShock4 = true;
+				}
+			}
+		}
+		
+		if (mapping.rightStickXAxis == -1 && mapping.rightStickYAxis == -1) {
+			InputDevice.MotionRange zRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z);
+			InputDevice.MotionRange rzRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ);
+			
+			// Most other controllers use Z and RZ for the right stick
+			if (zRange != null && rzRange != null) {
+				mapping.rightStickXAxis = MotionEvent.AXIS_Z;
+				mapping.rightStickYAxis = MotionEvent.AXIS_RZ;
+			}
+			else {
+				InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
+				InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
+				
+				// Try RX and RY now
+				if (rxRange != null && ryRange != null) {
+					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
+					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
+				}
+			}
+		}
+		
+		// Some devices have "hats" for d-pads
+		InputDevice.MotionRange hatXRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_X);
+		InputDevice.MotionRange hatYRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_Y);
+		if (hatXRange != null && hatYRange != null) {
+			mapping.hatXAxis = MotionEvent.AXIS_HAT_X;
+			mapping.hatYAxis = MotionEvent.AXIS_HAT_Y;
+		}
+		
+		if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+            mapping.leftStickDeadzoneRadius = (float) stickDeadzone;
+		}
+		
+		if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+            mapping.rightStickDeadzoneRadius = (float) stickDeadzone;
+        }
+
+        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
+            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, mapping.leftTriggerAxis);
+            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, mapping.rightTriggerAxis);
+
+            // It's important to have a valid deadzone so controller packet batching works properly
+            mapping.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
+
+            // For triggers without (valid) deadzones, we'll use 13% (around XInput's default)
+            if (mapping.triggerDeadzone < 0.13f ||
+                mapping.triggerDeadzone > 0.30f)
+            {
+                mapping.triggerDeadzone = 0.13f;
+            }
+        }
+
+        if (devName != null) {
+            // For the Nexus Player (and probably other ATV devices), we should
+            // use the back button as start since it doesn't have a start/menu button
+            // on the controller
+            if (devName.contains("ASUS Gamepad")) {
+                // We can only do this check on KitKat or higher, but it doesn't matter since ATV
+                // is Android 5.0 anyway
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+                    boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
+                    if (!hasStartKey[0] && !hasStartKey[1]) {
+                        mapping.backIsStart = true;
+                    }
+                }
+
+                // The ASUS Gamepad has triggers that sit far forward and are prone to false presses
+                // so we increase the deadzone on them to minimize this
+                mapping.triggerDeadzone = 0.30f;
+            }
+            // Classify this device as a remote by name
+            else if (devName.contains("Fire TV Remote") || devName.contains("Nexus Remote")) {
+                // It's only a remote if it doesn't any sticks
+                if (!mapping.hasJoystickAxes) {
+                    mapping.isRemote = true;
+                }
+            }
+            // NYKO Playpad has a fake hat that mimics the left stick for some reason
+            else if (devName.contains("NYKO PLAYPAD")) {
+                mapping.hatXAxis = -1;
+                mapping.hatYAxis = -1;
+            }
+        }
+
+        LimeLog.info("Analog stick deadzone: "+mapping.leftStickDeadzoneRadius+" "+mapping.rightStickDeadzoneRadius);
+        LimeLog.info("Trigger deadzone: "+mapping.triggerDeadzone);
+		
+		return mapping;
+	}
+	
+	private ControllerMapping getMappingForDevice(InputDevice dev) {
+		// Unknown devices use the default mapping
+		if (dev == null) {
+			return defaultMapping;
+		}
+		
+		String descriptor = dev.getDescriptor();
+		
+		// Return the existing mapping if it exists
+		ControllerMapping mapping = mappings.get(descriptor);
+		if (mapping != null) {
+			return mapping;
+		}
+		
+		// Otherwise create a new mapping
+		mapping = createMappingForDevice(dev);
+		mappings.put(descriptor, mapping);
+		
+		return mapping;
+	}
+	
+	private void sendControllerInputPacket() {
+		conn.sendControllerInput(inputMap, leftTrigger, rightTrigger,
+				leftStickX, leftStickY, rightStickX, rightStickY);
+	}
+
+    // Return a valid keycode, 0 to consume, or -1 to not consume the event
+    // Device MAY BE NULL
+	private int handleRemapping(ControllerMapping mapping, KeyEvent event) {
+        // For remotes, don't capture the back button
+		if (mapping.isRemote) {
+            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+                return -1;
+            }
+        }
+
+        if (mapping.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;
+			}
+		}
+		
+		if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+			switch (event.getKeyCode()) {
+			// These are duplicate dpad events for hat input
+			case KeyEvent.KEYCODE_DPAD_LEFT:
+			case KeyEvent.KEYCODE_DPAD_RIGHT:
+			case KeyEvent.KEYCODE_DPAD_CENTER:
+			case KeyEvent.KEYCODE_DPAD_UP:
+			case KeyEvent.KEYCODE_DPAD_DOWN:
+				return 0;
+			}
+		}
+		else if (mapping.hatXAxis == -1 &&
+				 mapping.hatYAxis == -1 &&
+				 mapping.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
+			switch (event.getScanCode())
+			{
+			case 704:
+				return KeyEvent.KEYCODE_DPAD_LEFT;
+			case 705:
+				return KeyEvent.KEYCODE_DPAD_RIGHT;
+			case 706:
+				return KeyEvent.KEYCODE_DPAD_UP;
+			case 707:
+				return KeyEvent.KEYCODE_DPAD_DOWN;
+			}
+		}
+
+        // Past here we can fixup the keycode and potentially trigger
+        // another special case so we need to remember what keycode we're using
+        int keyCode = event.getKeyCode();
+
+        // This is a hack for (at least) the "Tablet Remote" app
+        // which sends BACK with META_ALT_ON instead of KEYCODE_BUTTON_B
+        if (keyCode == KeyEvent.KEYCODE_BACK &&
+                !event.hasNoModifiers() &&
+                (event.getFlags() & KeyEvent.FLAG_SOFT_KEYBOARD) != 0)
+        {
+            keyCode = KeyEvent.KEYCODE_BUTTON_B;
+        }
+
+        if (keyCode == KeyEvent.KEYCODE_BUTTON_START ||
+                keyCode == KeyEvent.KEYCODE_MENU) {
+            // Ensure that we never use back as start if we have a real start
+            mapping.backIsStart = false;
+        }
+        else if (mapping.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
+            // Emulate the start button with back
+            return KeyEvent.KEYCODE_BUTTON_START;
+        }
+		
+		return keyCode;
+	}
+
+    private Vector2d populateCachedVector(float x, float y) {
+        // Reinitialize our cached Vector2d object
+        inputVector.initialize(x, y);
+        return inputVector;
+    }
+	
+	private void handleDeadZone(Vector2d stickVector, float deadzoneRadius) {
+		if (stickVector.getMagnitude() <= deadzoneRadius) {
+			// Deadzone
+            stickVector.initialize(0, 0);
+		}
+
+        // We're not normalizing here because we let the computer handle the deadzones.
+        // Normalizing can make the deadzones larger than they should be after the computer also
+        // evaluates the deadzone.
+    }
+
+    private void handleAxisSet(ControllerMapping mapping, float lsX, float lsY, float rsX,
+                               float rsY, float lt, float rt, float hatX, float hatY) {
+
+        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+            Vector2d leftStickVector = populateCachedVector(lsX, lsY);
+
+            handleDeadZone(leftStickVector, mapping.leftStickDeadzoneRadius);
+
+            leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
+            leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
+        }
+
+        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+            Vector2d rightStickVector = populateCachedVector(rsX, rsY);
+
+            handleDeadZone(rightStickVector, mapping.rightStickDeadzoneRadius);
+
+            rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
+            rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
+        }
+
+        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
+            if (mapping.triggersIdleNegative) {
+                lt = (lt + 1) / 2;
+                rt = (rt + 1) / 2;
+            }
+
+            if (lt <= mapping.triggerDeadzone) {
+                lt = 0;
+            }
+            if (rt <= mapping.triggerDeadzone) {
+                rt = 0;
+            }
+
+            leftTrigger = (byte)(lt * 0xFF);
+            rightTrigger = (byte)(rt * 0xFF);
+        }
+
+        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+            inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
+            if (hatX < -0.5) {
+                inputMap |= ControllerPacket.LEFT_FLAG;
+            }
+            else if (hatX > 0.5) {
+                inputMap |= ControllerPacket.RIGHT_FLAG;
+            }
+
+            inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
+            if (hatY < -0.5) {
+                inputMap |= ControllerPacket.UP_FLAG;
+            }
+            else if (hatY > 0.5) {
+                inputMap |= ControllerPacket.DOWN_FLAG;
+            }
+        }
+
+        sendControllerInputPacket();
+    }
+	
+	public boolean handleMotionEvent(MotionEvent event) {
+		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        float lsX = 0, lsY = 0, rsX = 0, rsY = 0, rt = 0, lt = 0, hatX = 0, hatY = 0;
+
+        // We purposefully ignore the historical values in the motion event as it makes
+        // the controller feel sluggish for some users.
+
+        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+            lsX = event.getAxisValue(mapping.leftStickXAxis);
+            lsY = event.getAxisValue(mapping.leftStickYAxis);
+        }
+
+        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+            rsX = event.getAxisValue(mapping.rightStickXAxis);
+            rsY = event.getAxisValue(mapping.rightStickYAxis);
+        }
+
+        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
+            lt = event.getAxisValue(mapping.leftTriggerAxis);
+            rt = event.getAxisValue(mapping.rightTriggerAxis);
+        }
+
+        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+            hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X);
+            hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
+        }
+
+        handleAxisSet(mapping, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
+
+		return true;
+	}
+	
+	public boolean handleButtonUp(KeyEvent event) {
+		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+
+        int keyCode = handleRemapping(mapping, event);
+		if (keyCode == 0) {
+			return true;
+		}
+		
+		// If the button hasn't been down long enough, sleep for a bit before sending the up event
+		// This allows "instant" button presses (like OUYA's virtual menu button) to work. This
+		// path should not be triggered during normal usage.
+		if (SystemClock.uptimeMillis() - event.getDownTime() < ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS)
+		{
+			// Since our sleep time is so short (10 ms), it shouldn't cause a problem doing this in the
+			// UI thread.
+			try {
+				Thread.sleep(ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS);
+			} catch (InterruptedException ignored) {}
+		}
+		
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_BUTTON_MODE:
+			inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_START:
+		case KeyEvent.KEYCODE_MENU:
+			inputMap &= ~ControllerPacket.PLAY_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BACK:
+		case KeyEvent.KEYCODE_BUTTON_SELECT:
+			inputMap &= ~ControllerPacket.BACK_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			inputMap &= ~ControllerPacket.LEFT_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			inputMap &= ~ControllerPacket.RIGHT_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_UP:
+			inputMap &= ~ControllerPacket.UP_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			inputMap &= ~ControllerPacket.DOWN_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_B:
+			inputMap &= ~ControllerPacket.B_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_CENTER:
+		case KeyEvent.KEYCODE_BUTTON_A:
+			inputMap &= ~ControllerPacket.A_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_X:
+			inputMap &= ~ControllerPacket.X_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_Y:
+			inputMap &= ~ControllerPacket.Y_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_L1:
+			inputMap &= ~ControllerPacket.LB_FLAG;
+			lastLbUpTime = SystemClock.uptimeMillis();
+			break;
+		case KeyEvent.KEYCODE_BUTTON_R1:
+			inputMap &= ~ControllerPacket.RB_FLAG;
+			lastRbUpTime = SystemClock.uptimeMillis();
+			break;
+		case KeyEvent.KEYCODE_BUTTON_THUMBL:
+			inputMap &= ~ControllerPacket.LS_CLK_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_THUMBR:
+			inputMap &= ~ControllerPacket.RS_CLK_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_L2:
+			leftTrigger = 0;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_R2:
+			rightTrigger = 0;
+			break;
+		default:
+			return false;
+		}
+		
+		// Check if we're emulating the select button
+		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
+		{
+			// If either start or LB is up, select comes up too
+			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+				(inputMap & ControllerPacket.LB_FLAG) == 0)
+			{
+				inputMap &= ~ControllerPacket.BACK_FLAG;
+				
+				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
+				
+				try {
+					Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
+				} catch (InterruptedException ignored) {}
+			}
+		}
+		
+		// Check if we're emulating the special button
+		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
+		{
+			// If either start or select and RB is up, the special button comes up too
+			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+				((inputMap & ControllerPacket.BACK_FLAG) == 0 &&
+				 (inputMap & ControllerPacket.RB_FLAG) == 0))
+			{
+				inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+				
+				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
+				
+				try {
+					Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
+				} catch (InterruptedException ignored) {}
+			}
+		}
+		
+		sendControllerInputPacket();
+		return true;
+	}
+	
+	public boolean handleButtonDown(KeyEvent event) {
+		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+
+        int keyCode = handleRemapping(mapping, event);
+		if (keyCode == 0) {
+			return true;
+		}
+		
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_BUTTON_MODE:
+			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_START:
+		case KeyEvent.KEYCODE_MENU:
+			inputMap |= ControllerPacket.PLAY_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BACK:
+		case KeyEvent.KEYCODE_BUTTON_SELECT:
+			inputMap |= ControllerPacket.BACK_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			inputMap |= ControllerPacket.LEFT_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			inputMap |= ControllerPacket.RIGHT_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_UP:
+			inputMap |= ControllerPacket.UP_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			inputMap |= ControllerPacket.DOWN_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_B:
+			inputMap |= ControllerPacket.B_FLAG;
+			break;
+		case KeyEvent.KEYCODE_DPAD_CENTER:
+		case KeyEvent.KEYCODE_BUTTON_A:
+			inputMap |= ControllerPacket.A_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_X:
+			inputMap |= ControllerPacket.X_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_Y:
+			inputMap |= ControllerPacket.Y_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_L1:
+			inputMap |= ControllerPacket.LB_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_R1:
+			inputMap |= ControllerPacket.RB_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_THUMBL:
+			inputMap |= ControllerPacket.LS_CLK_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_THUMBR:
+			inputMap |= ControllerPacket.RS_CLK_FLAG;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_L2:
+			leftTrigger = (byte)0xFF;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_R2:
+			rightTrigger = (byte)0xFF;
+			break;
+		default:
+			return false;
+		}
+		
+		// Start+LB acts like select for controllers with one button
+		if ((inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
+			((inputMap & ControllerPacket.LB_FLAG) != 0 ||
+			  SystemClock.uptimeMillis() - lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+		{
+			inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+			inputMap |= ControllerPacket.BACK_FLAG;
+			
+			emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+		}
+		
+		// We detect select+start or start+RB as the special button combo
+		if (((inputMap & ControllerPacket.RB_FLAG) != 0 ||
+			 (SystemClock.uptimeMillis() - lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
+			 (inputMap & ControllerPacket.BACK_FLAG) != 0) &&
+			(inputMap & ControllerPacket.PLAY_FLAG) != 0)
+		{
+			inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+			
+			emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+		}
+
+        // Send a new input packet if this is the first instance of a button down event
+        // or anytime if we're emulating a button
+        if (event.getRepeatCount() == 0 || emulatingButtonFlags != 0) {
+            sendControllerInputPacket();
+        }
+		return true;
+	}
+	
+	class ControllerMapping {
+		public int leftStickXAxis = -1;		
+		public int leftStickYAxis = -1;
+		public float leftStickDeadzoneRadius;
+
+		public int rightStickXAxis = -1;
+		public int rightStickYAxis = -1;
+		public float rightStickDeadzoneRadius;
+		
+		public int leftTriggerAxis = -1;
+		public int rightTriggerAxis = -1;
+		public boolean triggersIdleNegative;
+        public float triggerDeadzone;
+		
+		public int hatXAxis = -1;
+		public int hatYAxis = -1;
+		
+		public boolean isDualShock4;
+		public boolean isXboxController;
+        public boolean backIsStart;
+        public boolean isRemote;
+        public boolean hasJoystickAxes;
+	}
+}

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

@@ -0,0 +1,105 @@
+package com.limelight.binding.input;
+
+import com.limelight.nvstream.NvConnection;
+import com.limelight.nvstream.input.MouseButtonPacket;
+
+public class TouchContext {
+	private int lastTouchX = 0;
+	private int lastTouchY = 0;
+	private int originalTouchX = 0;
+	private int originalTouchY = 0;
+	private long originalTouchTime = 0;
+	
+	private NvConnection conn;
+	private int actionIndex;
+    private double xFactor, yFactor;
+	
+	private static final int TAP_MOVEMENT_THRESHOLD = 10;
+	private static final int TAP_TIME_THRESHOLD = 250;
+	
+	public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
+	{
+		this.conn = conn;
+		this.actionIndex = actionIndex;
+        this.xFactor = xFactor;
+        this.yFactor = yFactor;
+	}
+
+    public int getActionIndex()
+    {
+        return actionIndex;
+    }
+	
+	private boolean isTap()
+	{
+		int xDelta = Math.abs(lastTouchX - originalTouchX);
+		int yDelta = Math.abs(lastTouchY - originalTouchY);
+		long timeDelta = System.currentTimeMillis() - originalTouchTime;
+		
+		return xDelta <= TAP_MOVEMENT_THRESHOLD &&
+				yDelta <= TAP_MOVEMENT_THRESHOLD &&
+				timeDelta <= TAP_TIME_THRESHOLD;
+	}
+	
+	private byte getMouseButtonIndex()
+	{
+		if (actionIndex == 1) {
+			return MouseButtonPacket.BUTTON_RIGHT;
+		}
+		else {
+			return MouseButtonPacket.BUTTON_LEFT;
+		}
+	}
+	
+	public boolean touchDownEvent(int eventX, int eventY)
+	{
+		originalTouchX = lastTouchX = eventX;
+		originalTouchY = lastTouchY = eventY;
+		originalTouchTime = System.currentTimeMillis();
+		
+		return true;
+	}
+	
+	public void touchUpEvent(int eventX, int eventY)
+	{
+		if (isTap())
+		{
+			byte buttonIndex = getMouseButtonIndex();
+			
+			// Lower the mouse button
+			conn.sendMouseButtonDown(buttonIndex);
+			
+			// We need to sleep a bit here because some games
+			// do input detection by polling
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException ignored) {}
+			
+			// Raise the mouse button
+			conn.sendMouseButtonUp(buttonIndex);
+		}
+	}
+	
+	public boolean touchMoveEvent(int eventX, int eventY)
+	{	
+		if (eventX != lastTouchX || eventY != lastTouchY)
+		{
+			// We only send moves for the primary touch point
+			if (actionIndex == 0) {
+                int deltaX = eventX - lastTouchX;
+                int deltaY = eventY - lastTouchY;
+
+                // Scale the deltas based on the factors passed to our constructor
+                deltaX = (int)Math.round((double)deltaX * xFactor);
+                deltaY = (int)Math.round((double)deltaY * yFactor);
+
+				conn.sendMouseMove((short)deltaX, (short)deltaY);
+			}
+			
+			lastTouchX = eventX;
+			lastTouchY = eventY;
+		}
+		
+		return true;
+	}
+}

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

@@ -0,0 +1,41 @@
+package com.limelight.binding.input.evdev;
+
+public class EvdevEvent {
+	public static final int EVDEV_MIN_EVENT_SIZE = 16;
+	public static final int EVDEV_MAX_EVENT_SIZE = 24;
+	
+	/* Event types */
+	public static final short EV_SYN = 0x00;
+	public static final short EV_KEY = 0x01;
+	public static final short EV_REL = 0x02;
+	public static final short EV_MSC = 0x04;
+	
+	/* Relative axes */
+	public static final short REL_X = 0x00;
+	public static final short REL_Y = 0x01;
+	public static final short REL_WHEEL = 0x08;
+	
+	/* Buttons */
+	public static final short BTN_LEFT = 0x110;
+	public static final short BTN_RIGHT = 0x111;
+	public static final short BTN_MIDDLE = 0x112;
+	public static final short BTN_SIDE = 0x113;
+	public static final short BTN_EXTRA = 0x114;
+	public static final short BTN_FORWARD = 0x115;
+	public static final short BTN_BACK = 0x116;
+	public static final short BTN_TASK = 0x117;
+	public static final short BTN_GAMEPAD = 0x130;
+	
+	/* Keys */
+	public static final short KEY_Q = 16;
+	
+	public short type;
+	public short code;
+	public int value;
+	
+	public EvdevEvent(short type, short code, int value) {
+		this.type = type;
+		this.code = code;
+		this.value = value;
+	}
+}

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

@@ -0,0 +1,167 @@
+package com.limelight.binding.input.evdev;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import com.limelight.LimeLog;
+
+public class EvdevHandler {
+
+	private String absolutePath;
+	private EvdevListener listener;
+	private boolean shutdown = false;
+	private int fd = -1;
+	
+	private Thread handlerThread = new Thread() {
+		@Override
+		public void run() {
+			// All the finally blocks here make this code look like a mess
+			// but it's important that we get this right to avoid causing
+			// system-wide input problems.
+			
+			// Open the /dev/input/eventX file
+			fd = EvdevReader.open(absolutePath);
+			if (fd == -1) {
+				LimeLog.warning("Unable to open "+absolutePath);
+				return;
+			}
+
+			try {
+				// Check if it's a mouse or keyboard, but not a gamepad
+				if ((!EvdevReader.isMouse(fd) && !EvdevReader.isAlphaKeyboard(fd)) ||
+					EvdevReader.isGamepad(fd)) {
+					// We only handle keyboards and mice
+					return;
+				}
+
+				// Grab it for ourselves
+				if (!EvdevReader.grab(fd)) {
+					LimeLog.warning("Unable to grab "+absolutePath);
+					return;
+				}
+
+				LimeLog.info("Grabbed device for raw keyboard/mouse input: "+absolutePath);
+
+				ByteBuffer buffer = ByteBuffer.allocate(EvdevEvent.EVDEV_MAX_EVENT_SIZE).order(ByteOrder.nativeOrder());
+
+				try {
+					int deltaX = 0;
+					int deltaY = 0;
+					byte deltaScroll = 0;
+
+					while (!isInterrupted() && !shutdown) {
+						EvdevEvent event = EvdevReader.read(fd, buffer);
+						if (event == null) {
+							return;
+						}
+
+						switch (event.type)
+						{
+						case EvdevEvent.EV_SYN:
+							if (deltaX != 0 || deltaY != 0) {
+								listener.mouseMove(deltaX, deltaY);
+								deltaX = deltaY = 0;
+							}
+							if (deltaScroll != 0) {
+								listener.mouseScroll(deltaScroll);
+								deltaScroll = 0;
+							}
+							break;
+
+						case EvdevEvent.EV_REL:
+							switch (event.code)
+							{
+							case EvdevEvent.REL_X:
+								deltaX = event.value;
+								break;
+							case EvdevEvent.REL_Y:
+								deltaY = event.value;
+								break;
+							case EvdevEvent.REL_WHEEL:
+								deltaScroll = (byte) event.value;
+								break;
+							}
+							break;
+
+						case EvdevEvent.EV_KEY:
+							switch (event.code)
+							{
+							case EvdevEvent.BTN_LEFT:
+								listener.mouseButtonEvent(EvdevListener.BUTTON_LEFT,
+										event.value != 0);
+								break;
+							case EvdevEvent.BTN_MIDDLE:
+								listener.mouseButtonEvent(EvdevListener.BUTTON_MIDDLE,
+										event.value != 0);
+								break;
+							case EvdevEvent.BTN_RIGHT:
+								listener.mouseButtonEvent(EvdevListener.BUTTON_RIGHT,
+										event.value != 0);
+								break;
+								
+							case EvdevEvent.BTN_SIDE:
+							case EvdevEvent.BTN_EXTRA:
+							case EvdevEvent.BTN_FORWARD:
+							case EvdevEvent.BTN_BACK:
+							case EvdevEvent.BTN_TASK:
+								// Other unhandled mouse buttons
+								break;
+								
+							default:
+								// We got some unrecognized button. This means
+								// someone is trying to use the other device in this
+								// "combination" input device. We'll try to handle
+								// it via keyboard, but we're not going to disconnect
+								// if we can't
+								short keyCode = EvdevTranslator.translateEvdevKeyCode(event.code);
+								if (keyCode != 0) {
+									listener.keyboardEvent(event.value != 0, keyCode);
+								}
+								break;
+							}
+							break;
+							
+						case EvdevEvent.EV_MSC:
+							break;
+						}
+					}
+				} finally {
+					// Release our grab
+					EvdevReader.ungrab(fd);
+				}
+			} finally {
+				// Close the file
+				EvdevReader.close(fd);
+			}
+		}
+	};
+	
+	public EvdevHandler(String absolutePath, EvdevListener listener) {
+		this.absolutePath = absolutePath;
+		this.listener = listener;
+	}
+	
+	public void start() {
+		handlerThread.start();
+	}
+	
+	public void stop() {
+		// Close the fd. It doesn't matter if this races
+		// with the handler thread. We'll close this out from
+		// under the thread to wake it up
+		if (fd != -1) {
+			EvdevReader.close(fd);
+		}
+		
+		shutdown = true;
+		handlerThread.interrupt();
+		
+		try {
+			handlerThread.join();
+		} catch (InterruptedException ignored) {}
+	}
+	
+	public void notifyDeleted() {
+		stop();
+	}
+}

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

@@ -0,0 +1,12 @@
+package com.limelight.binding.input.evdev;
+
+public interface EvdevListener {
+	public static final int BUTTON_LEFT = 1;
+	public static final int BUTTON_MIDDLE = 2;
+	public static final int BUTTON_RIGHT = 3;
+	
+	public void mouseMove(int deltaX, int deltaY);
+	public void mouseButtonEvent(int buttonId, boolean down);
+	public void mouseScroll(byte amount);
+	public void keyboardEvent(boolean buttonDown, short keyCode);
+}

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

@@ -0,0 +1,105 @@
+package com.limelight.binding.input.evdev;
+
+import android.os.Build;
+
+import java.nio.ByteBuffer;
+import java.util.Locale;
+
+import com.limelight.LimeLog;
+
+public class EvdevReader {
+	static {
+		System.loadLibrary("evdev_reader");
+	}
+
+    public static void patchSeLinuxPolicies() {
+        //
+        // FIXME: We REALLY shouldn't being changing permissions on the input devices like this.
+        // We should probably do something clever with a separate daemon and talk via a localhost
+        // socket. We don't return the SELinux policies back to default after we're done which I feel
+        // bad about, but we do chmod the input devices back so I don't think any additional attack surface
+        // remains opened after streaming other than listing the /dev/input directory which you wouldn't
+        // normally be able to do with SELinux enforcing on Lollipop.
+        //
+        // We need to modify SELinux policies to allow us to capture input devices on Lollipop and possibly other
+        // more restrictive ROMs. Per Chainfire's SuperSU documentation, the supolicy binary is provided on
+        // 4.4 and later to do live SELinux policy changes.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            EvdevShell shell = EvdevShell.getInstance();
+            shell.runCommand("supolicy --live \"allow untrusted_app input_device dir getattr\" " +
+                    "\"allow untrusted_app input_device chr_file { open read write ioctl }\"");
+        }
+    }
+	
+	// Requires root to chmod /dev/input/eventX
+	public static void setPermissions(String[] files, int octalPermissions) {
+        EvdevShell shell = EvdevShell.getInstance();
+
+        for (String file : files) {
+            shell.runCommand(String.format((Locale)null, "chmod %o %s", octalPermissions, file));
+        }
+	}
+	
+	// Returns the fd to be passed to other function or -1 on error
+	public static native int open(String fileName);
+	
+	// Prevent other apps (including Android itself) from using the device while "grabbed"
+	public static native boolean grab(int fd);
+	public static native boolean ungrab(int fd);
+	
+	// Used for checking device capabilities
+	public static native boolean hasRelAxis(int fd, short axis);
+	public static native boolean hasAbsAxis(int fd, short axis);
+	public static native boolean hasKey(int fd, short key);
+	
+	public static boolean isMouse(int fd) {
+		// This is the same check that Android does in EventHub.cpp
+		return hasRelAxis(fd, EvdevEvent.REL_X) &&
+				hasRelAxis(fd, EvdevEvent.REL_Y) &&
+				hasKey(fd, EvdevEvent.BTN_LEFT);
+	}
+	
+	public static boolean isAlphaKeyboard(int fd) {
+		// This is the same check that Android does in EventHub.cpp
+		return hasKey(fd, EvdevEvent.KEY_Q);
+	}
+	
+	public static boolean isGamepad(int fd) {
+		return hasKey(fd, EvdevEvent.BTN_GAMEPAD);
+	}
+	
+	// Returns the bytes read or -1 on error
+	private static native int read(int fd, byte[] buffer);
+	
+	// Takes a byte buffer to use to read the output into.
+	// This buffer MUST be in native byte order and at least
+	// EVDEV_MAX_EVENT_SIZE bytes long.
+	public static EvdevEvent read(int fd, ByteBuffer buffer) {
+		int bytesRead = read(fd, buffer.array());
+		if (bytesRead < 0) {
+			LimeLog.warning("Failed to read: "+bytesRead);
+			return null;
+		}
+		else if (bytesRead < EvdevEvent.EVDEV_MIN_EVENT_SIZE) {
+			LimeLog.warning("Short read: "+bytesRead);
+			return null;
+		}
+		
+		buffer.limit(bytesRead);
+		buffer.rewind();
+		
+		// Throw away the time stamp
+		if (bytesRead == EvdevEvent.EVDEV_MAX_EVENT_SIZE) {
+			buffer.getLong();
+			buffer.getLong();
+		} else {
+			buffer.getInt();
+			buffer.getInt();
+		}
+		
+		return new EvdevEvent(buffer.getShort(), buffer.getShort(), buffer.getInt());
+	}
+	
+	// Closes the fd from open()
+	public static native int close(int fd);
+}

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

@@ -0,0 +1,116 @@
+package com.limelight.binding.input.evdev;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Scanner;
+import java.util.UUID;
+
+public class EvdevShell {
+    private OutputStream stdin;
+    private InputStream stdout;
+    private Process shell;
+    private final String uuidString = UUID.randomUUID().toString();
+
+    private static final EvdevShell globalShell = new EvdevShell();
+
+    public static EvdevShell getInstance() {
+        return globalShell;
+    }
+
+    public void startShell() {
+        ProcessBuilder builder = new ProcessBuilder("su");
+
+        try {
+            // Redirect stderr to stdout
+            builder.redirectErrorStream(true);
+            shell = builder.start();
+
+            stdin = shell.getOutputStream();
+            stdout = shell.getInputStream();
+        } catch (IOException e) {
+            // This is unexpected
+            e.printStackTrace();
+
+            // Kill the shell if it spawned
+            if (stdin != null) {
+                try {
+                    stdin.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                } finally {
+                    stdin = null;
+                }
+            }
+            if (stdout != null) {
+                try {
+                    stdout.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                } finally {
+                    stdout = null;
+                }
+            }
+            if (shell != null) {
+                shell.destroy();
+                shell = null;
+            }
+        }
+    }
+
+    public void runCommand(String command) {
+        if (shell == null) {
+            // Shell never started
+            return;
+        }
+
+        try {
+            // Write the command followed by an echo with our UUID
+            stdin.write((command+'\n').getBytes("UTF-8"));
+            stdin.write(("echo "+uuidString+'\n').getBytes("UTF-8"));
+            stdin.flush();
+
+            // This is the only command in flight so we can use a scanner
+            // without worrying about it eating too many characters
+            Scanner scanner = new Scanner(stdout);
+            while (scanner.hasNext()) {
+                if (scanner.next().contains(uuidString)) {
+                    // Our command ran
+                    return;
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void stopShell() throws InterruptedException {
+        boolean exitWritten = false;
+
+        if (shell == null) {
+            // Shell never started
+            return;
+        }
+
+        try {
+            stdin.write("exit\n".getBytes("UTF-8"));
+            exitWritten = true;
+        } catch (IOException e) {
+            // We'll destroy the process without
+            // waiting for it to terminate since
+            // we don't know whether our exit command made it
+            e.printStackTrace();
+        }
+
+        if (exitWritten) {
+            try {
+                shell.waitFor();
+            } finally {
+                shell.destroy();
+            }
+        }
+        else {
+            shell.destroy();
+        }
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.limelight.binding.input.evdev;
+
+import android.view.KeyEvent;
+
+public class EvdevTranslator {
+
+	public static final short EVDEV_KEY_CODES[] = {
+		0, //KeyEvent.VK_RESERVED
+		KeyEvent.KEYCODE_ESCAPE,
+		KeyEvent.KEYCODE_1,
+		KeyEvent.KEYCODE_2,
+		KeyEvent.KEYCODE_3,
+		KeyEvent.KEYCODE_4,
+		KeyEvent.KEYCODE_5,
+		KeyEvent.KEYCODE_6,
+		KeyEvent.KEYCODE_7,
+		KeyEvent.KEYCODE_8,
+		KeyEvent.KEYCODE_9,
+		KeyEvent.KEYCODE_0,
+		KeyEvent.KEYCODE_MINUS,
+		KeyEvent.KEYCODE_EQUALS,
+		KeyEvent.KEYCODE_DEL,
+		KeyEvent.KEYCODE_TAB,
+		KeyEvent.KEYCODE_Q,
+		KeyEvent.KEYCODE_W,
+		KeyEvent.KEYCODE_E,
+		KeyEvent.KEYCODE_R,
+		KeyEvent.KEYCODE_T,
+		KeyEvent.KEYCODE_Y,
+		KeyEvent.KEYCODE_U,
+		KeyEvent.KEYCODE_I,
+		KeyEvent.KEYCODE_O,
+		KeyEvent.KEYCODE_P,
+		KeyEvent.KEYCODE_LEFT_BRACKET,
+		KeyEvent.KEYCODE_RIGHT_BRACKET,
+		KeyEvent.KEYCODE_ENTER,
+		KeyEvent.KEYCODE_CTRL_LEFT,
+		KeyEvent.KEYCODE_A,
+		KeyEvent.KEYCODE_S,
+		KeyEvent.KEYCODE_D,
+		KeyEvent.KEYCODE_F,
+		KeyEvent.KEYCODE_G,
+		KeyEvent.KEYCODE_H,
+		KeyEvent.KEYCODE_J,
+		KeyEvent.KEYCODE_K,
+		KeyEvent.KEYCODE_L,
+		KeyEvent.KEYCODE_SEMICOLON,
+		KeyEvent.KEYCODE_APOSTROPHE,
+		KeyEvent.KEYCODE_GRAVE,
+		KeyEvent.KEYCODE_SHIFT_LEFT,
+		KeyEvent.KEYCODE_BACKSLASH,
+		KeyEvent.KEYCODE_Z,
+		KeyEvent.KEYCODE_X,
+		KeyEvent.KEYCODE_C,
+		KeyEvent.KEYCODE_V,
+		KeyEvent.KEYCODE_B,
+		KeyEvent.KEYCODE_N,
+		KeyEvent.KEYCODE_M,
+		KeyEvent.KEYCODE_COMMA,
+		KeyEvent.KEYCODE_PERIOD,
+		KeyEvent.KEYCODE_SLASH,
+		KeyEvent.KEYCODE_SHIFT_RIGHT,
+		KeyEvent.KEYCODE_NUMPAD_MULTIPLY,
+		KeyEvent.KEYCODE_ALT_LEFT,
+		KeyEvent.KEYCODE_SPACE,
+		KeyEvent.KEYCODE_CAPS_LOCK,
+		KeyEvent.KEYCODE_F1,
+		KeyEvent.KEYCODE_F2,
+		KeyEvent.KEYCODE_F3,
+		KeyEvent.KEYCODE_F4,
+		KeyEvent.KEYCODE_F5,
+		KeyEvent.KEYCODE_F6,
+		KeyEvent.KEYCODE_F7,
+		KeyEvent.KEYCODE_F8,
+		KeyEvent.KEYCODE_F9,
+		KeyEvent.KEYCODE_F10,
+		KeyEvent.KEYCODE_NUM_LOCK,
+		KeyEvent.KEYCODE_SCROLL_LOCK,
+		KeyEvent.KEYCODE_NUMPAD_7,
+		KeyEvent.KEYCODE_NUMPAD_8,
+		KeyEvent.KEYCODE_NUMPAD_9,
+		KeyEvent.KEYCODE_NUMPAD_SUBTRACT,
+		KeyEvent.KEYCODE_NUMPAD_4,
+		KeyEvent.KEYCODE_NUMPAD_5,
+		KeyEvent.KEYCODE_NUMPAD_6,
+		KeyEvent.KEYCODE_NUMPAD_ADD,
+		KeyEvent.KEYCODE_NUMPAD_1,
+		KeyEvent.KEYCODE_NUMPAD_2,
+		KeyEvent.KEYCODE_NUMPAD_3,
+		KeyEvent.KEYCODE_NUMPAD_0,
+		KeyEvent.KEYCODE_NUMPAD_DOT,
+		0,
+		0, //KeyEvent.VK_ZENKAKUHANKAKU,
+		0, //KeyEvent.VK_102ND,
+		KeyEvent.KEYCODE_F11,
+		KeyEvent.KEYCODE_F12,
+		0, //KeyEvent.VK_RO,
+		0, //KeyEvent.VK_KATAKANA,
+		0, //KeyEvent.VK_HIRAGANA,
+		0, //KeyEvent.VK_HENKAN,
+		0, //KeyEvent.VK_KATAKANAHIRAGANA,
+		0, //KeyEvent.VK_MUHENKAN,
+		0, //KeyEvent.VK_KPJPCOMMA,
+		KeyEvent.KEYCODE_NUMPAD_ENTER,
+		KeyEvent.KEYCODE_CTRL_RIGHT,
+		KeyEvent.KEYCODE_NUMPAD_DIVIDE,
+		KeyEvent.KEYCODE_SYSRQ,
+		KeyEvent.KEYCODE_ALT_RIGHT,
+		0, //KeyEvent.VK_LINEFEED,
+		KeyEvent.KEYCODE_HOME,
+		KeyEvent.KEYCODE_DPAD_UP,
+		KeyEvent.KEYCODE_PAGE_UP,
+		KeyEvent.KEYCODE_DPAD_LEFT,
+		KeyEvent.KEYCODE_DPAD_RIGHT,
+		KeyEvent.KEYCODE_MOVE_END,
+		KeyEvent.KEYCODE_DPAD_DOWN,
+		KeyEvent.KEYCODE_PAGE_DOWN,
+		KeyEvent.KEYCODE_INSERT,
+		KeyEvent.KEYCODE_FORWARD_DEL,
+		0, //KeyEvent.VK_MACRO,
+		0, //KeyEvent.VK_MUTE,
+		0, //KeyEvent.VK_VOLUMEDOWN,
+		0, //KeyEvent.VK_VOLUMEUP,
+		0, //KeyEvent.VK_POWER, /* SC System Power Down */
+		KeyEvent.KEYCODE_NUMPAD_EQUALS,
+		0, //KeyEvent.VK_KPPLUSMINUS,
+		KeyEvent.KEYCODE_BREAK,
+		0, //KeyEvent.VK_SCALE, /* AL Compiz Scale (Expose) */
+	};
+	
+	public static short translateEvdevKeyCode(short evdevKeyCode) {
+		if (evdevKeyCode < EVDEV_KEY_CODES.length) {
+			return EVDEV_KEY_CODES[evdevKeyCode];
+		}
+		
+		return 0;
+	}
+
+}

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

@@ -0,0 +1,188 @@
+package com.limelight.binding.input.evdev;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.limelight.LimeLog;
+
+import android.os.FileObserver;
+
+@SuppressWarnings("ALL")
+public class EvdevWatcher {
+	private static final String PATH = "/dev/input";
+	private static final String REQUIRED_FILE_PREFIX = "event";
+	
+	private final HashMap<String, EvdevHandler> handlers = new HashMap<String, EvdevHandler>();
+	private boolean shutdown = false;
+	private boolean init = false;
+	private boolean ungrabbed = false;
+	private EvdevListener listener;
+	private Thread startThread;
+
+    private static boolean patchedSeLinuxPolicies = false;
+	
+	private FileObserver observer = new FileObserver(PATH, FileObserver.CREATE | FileObserver.DELETE) {
+		@Override
+		public void onEvent(int event, String fileName) {
+			if (fileName == null) {
+				return;
+			}
+			
+			if (!fileName.startsWith(REQUIRED_FILE_PREFIX)) {
+				return;
+			}
+			
+			synchronized (handlers) {
+				if (shutdown) {
+					return;
+				}
+				
+				if ((event & FileObserver.CREATE) != 0) {
+					LimeLog.info("Starting evdev handler for "+fileName);
+					
+					if (!init) {
+						// If this a real new device, update permissions again so we can read it
+						EvdevReader.setPermissions(new String[]{PATH + "/" + fileName}, 0666);
+					}
+					
+					EvdevHandler handler = new EvdevHandler(PATH + "/" + fileName, listener);
+					
+					// If we're ungrabbed now, don't start the handler
+					if (!ungrabbed) {
+						handler.start();
+					}
+					
+					handlers.put(fileName, handler);
+				}
+				
+				if ((event & FileObserver.DELETE) != 0) {
+					LimeLog.info("Halting evdev handler for "+fileName);
+					
+					EvdevHandler handler = handlers.remove(fileName);
+					if (handler != null) {
+						handler.notifyDeleted();
+					}
+				}
+			}
+		}
+	};
+	
+	public EvdevWatcher(EvdevListener listener) {
+		this.listener = listener;
+	}
+	
+	private File[] rundownWithPermissionsChange(int newPermissions) {
+		// Rundown existing files
+		File devInputDir = new File(PATH);
+		File[] files = devInputDir.listFiles();
+		if (files == null) {
+			return new File[0];
+		}
+		
+		// Set desired permissions
+		String[] filePaths = new String[files.length];
+		for (int i = 0; i < files.length; i++) {
+			filePaths[i] = files[i].getAbsolutePath();
+		}
+		EvdevReader.setPermissions(filePaths, newPermissions);
+		
+		return files;
+	}
+	
+	public void ungrabAll() {
+		synchronized (handlers) {
+			// Note that we're ungrabbed for now
+			ungrabbed = true;
+			
+			// Stop all handlers
+			for (EvdevHandler handler : handlers.values()) {
+				handler.stop();
+			}
+		}
+	}
+	
+	public void regrabAll() {
+		synchronized (handlers) {
+			// We're regrabbing everything now
+			ungrabbed = false;
+			
+			for (Map.Entry<String, EvdevHandler> entry : handlers.entrySet()) {
+				// We need to recreate each entry since we can't reuse a stopped one
+				entry.setValue(new EvdevHandler(PATH + "/" + entry.getKey(), listener));
+				entry.getValue().start();
+			}
+		}
+	}
+	
+	public void start() {
+		startThread = new Thread() {
+			@Override
+			public void run() {
+                // Initialize the root shell
+                EvdevShell.getInstance().startShell();
+
+                // Patch SELinux policies (if needed)
+                if (!patchedSeLinuxPolicies) {
+                    EvdevReader.patchSeLinuxPolicies();
+                    patchedSeLinuxPolicies = true;
+                }
+
+				// List all files and allow us access
+				File[] files = rundownWithPermissionsChange(0666);
+				
+				init = true;
+				for (File f : files) {
+					observer.onEvent(FileObserver.CREATE, f.getName());
+				}
+				
+				// Done with initial onEvent calls
+				init = false;
+				
+				// Start watching for new files
+				observer.startWatching();
+				
+				synchronized (startThread) {
+					// Wait to be awoken again by shutdown()
+					try {
+						startThread.wait();
+					} catch (InterruptedException e) {}
+				}
+				
+				// Giveup eventX permissions
+				rundownWithPermissionsChange(0660);
+
+                // Kill the root shell
+                try {
+                    EvdevShell.getInstance().stopShell();
+                } catch (InterruptedException e) {}
+			}
+		};
+		startThread.start();
+	}
+	
+	public void shutdown() {
+		// Let start thread cleanup on it's own sweet time
+		synchronized (startThread) {
+			startThread.notify();
+		}
+		
+		// Stop the observer
+		observer.stopWatching();
+		
+		synchronized (handlers) {			
+			// Stop creating new handlers
+			shutdown = true;
+			
+			// If we've already ungrabbed, there's nothing else to do
+			if (ungrabbed) {
+				return;
+			}
+			
+			// Stop all handlers
+			for (EvdevHandler handler : handlers.values()) {
+				handler.stop();
+			}
+		}
+	}
+}

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

@@ -5,7 +5,6 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.concurrent.locks.LockSupport;
 
 import android.graphics.PixelFormat;
 import android.os.Build;
@@ -18,16 +17,17 @@ import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 import com.limelight.nvstream.av.video.VideoDepacketizer;
 import com.limelight.nvstream.av.video.cpu.AvcDecoder;
 
-public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
+@SuppressWarnings("EmptyCatchBlock")
+public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
 
-	private Thread rendererThread;
+	private Thread rendererThread, decoderThread;
 	private int targetFps;
 	
 	private static final int DECODER_BUFFER_SIZE = 92*1024;
 	private ByteBuffer decoderBuffer;
 	
 	// Only sleep if the difference is above this value
-	private static final int WAIT_CEILING_MS = 8;
+	private static final int WAIT_CEILING_MS = 5;
 	
 	private static final int LOW_PERF = 1;
 	private static final int MED_PERF = 2;
@@ -38,6 +38,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 	
 	private int cpuCount = Runtime.getRuntime().availableProcessors();
 	
+	@SuppressWarnings("unused")
 	private int findOptimalPerformanceLevel() {
 		StringBuilder cpuInfo = new StringBuilder();
 		BufferedReader br = null;
@@ -93,7 +94,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
 		this.targetFps = redrawRate;
 		
-		int perfLevel = findOptimalPerformanceLevel();
+		int perfLevel = LOW_PERF; //findOptimalPerformanceLevel();
 		int threadCount;
 		
 		int avcFlags = 0;
@@ -106,9 +107,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 
 		case LOW_PERF:
 			// Disable the loop filter for performance reasons
-			avcFlags = AvcDecoder.DISABLE_LOOP_FILTER |
+			avcFlags = AvcDecoder.FAST_BILINEAR_FILTERING;
-				AvcDecoder.FAST_BILINEAR_FILTERING |
-				AvcDecoder.FAST_DECODE;
 			
 			// Use plenty of threads to try to utilize the CPU as best we can
 			threadCount = cpuCount - 1;
@@ -116,8 +115,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 
 		default:
 		case MED_PERF:
-			avcFlags = AvcDecoder.BILINEAR_FILTERING |
+			avcFlags = AvcDecoder.BILINEAR_FILTERING;
-				AvcDecoder.FAST_DECODE;
 			
 			// Only use 2 threads to minimize frame processing latency
 			threadCount = 2;
@@ -143,7 +141,9 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 			throw new IllegalStateException("AVC decoder initialization failure: "+err);
 		}
 		
-		AvcDecoder.setRenderTarget(sh.getSurface());
+		if (!AvcDecoder.setRenderTarget(sh.getSurface())) {
+            return false;
+        }
 		
 		decoderBuffer = ByteBuffer.allocate(DECODER_BUFFER_SIZE + AvcDecoder.getInputPaddingSize());
 		
@@ -154,6 +154,26 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 
 	@Override
 	public boolean start(final VideoDepacketizer depacketizer) {
+        decoderThread = new Thread() {
+            @Override
+            public void run() {
+                DecodeUnit du;
+                while (!isInterrupted()) {
+                    try {
+                        du = depacketizer.takeNextDecodeUnit();
+                    } catch (InterruptedException e) {
+                        break;
+                    }
+
+                    submitDecodeUnit(du);
+                    depacketizer.freeDecodeUnit(du);
+                }
+            }
+        };
+        decoderThread.setName("Video - Decoder (CPU)");
+        decoderThread.setPriority(Thread.MAX_PRIORITY - 1);
+        decoderThread.start();
+
 		rendererThread = new Thread() {
 			@Override
 			public void run() {
@@ -161,17 +181,15 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 				DecodeUnit du;
 				while (!isInterrupted())
 				{
-					du = depacketizer.pollNextDecodeUnit(); 
-					if (du != null) {
-						submitDecodeUnit(du);
-						depacketizer.freeDecodeUnit(du);
-					}
-					
 					long diff = nextFrameTime - System.currentTimeMillis();
 
 					if (diff > WAIT_CEILING_MS) {
-						LockSupport.parkNanos(1);
+                        try {
-						continue;
+                            Thread.sleep(diff - WAIT_CEILING_MS);
+                        } catch (InterruptedException e) {
+                            return;
+                        }
+                        continue;
 					}
 
 					nextFrameTime = computePresentationTimeMs(targetFps);
@@ -192,10 +210,14 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 	@Override
 	public void stop() {
 		rendererThread.interrupt();
+        decoderThread.interrupt();
 		
 		try {
-			rendererThread.join();
+            rendererThread.join();
-		} catch (InterruptedException e) { }
+        } catch (InterruptedException e) { }
+        try {
+            decoderThread.join();
+        } catch (InterruptedException e) { }
 	}
 
 	@Override
@@ -232,7 +254,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 			
 		    // Add delta time to the totals (excluding probable outliers)
 		    long delta = timeAfterDecode - decodeUnit.getReceiveTimestamp();
-			if (delta >= 0 && delta < 300) {
+			if (delta >= 0 && delta < 1000) {
 			    totalTimeMs += delta;
 			    totalFrames++;
 			}
@@ -258,4 +280,9 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 		}
 		return (int)(totalTimeMs / totalFrames);
 	}
+
+    @Override
+    public String getDecoderName() {
+        return "CPU decoding";
+    }
 }

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

@@ -3,9 +3,9 @@ package com.limelight.binding.video;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 import com.limelight.nvstream.av.video.VideoDepacketizer;
 
-public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
+public class ConfigurableDecoderRenderer extends EnhancedDecoderRenderer {
 
-	private VideoDecoderRenderer decoderRenderer;
+	private EnhancedDecoderRenderer decoderRenderer;
 	
 	@Override
 	public void release() {
@@ -25,7 +25,7 @@ public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
 	public void initializeWithFlags(int drFlags) {
 		if ((drFlags & VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING) != 0 ||
 				((drFlags & VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING) == 0 &&
-				MediaCodecDecoderRenderer.findSafeDecoder() != null)) {
+				MediaCodecHelper.findProbableSafeDecoder() != null)) {
 			decoderRenderer = new MediaCodecDecoderRenderer();
 		}
 		else {
@@ -74,4 +74,14 @@ public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
 			return 0;
 		}
 	}
+
+    @Override
+    public String getDecoderName() {
+        if (decoderRenderer != null) {
+            return decoderRenderer.getDecoderName();
+        }
+        else {
+            return null;
+        }
+    }
 }

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

@@ -0,0 +1,7 @@
+package com.limelight.binding.video;
+
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+
+public abstract class EnhancedDecoderRenderer implements VideoDecoderRenderer {
+    public abstract String getDecoderName();
+}

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

@@ -0,0 +1,617 @@
+package com.limelight.binding.video;
+
+import java.nio.ByteBuffer;
+import java.util.Locale;
+import java.util.concurrent.locks.LockSupport;
+
+import org.jcodec.codecs.h264.io.model.SeqParameterSet;
+import org.jcodec.codecs.h264.io.model.VUIParameters;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.av.ByteBufferDescriptor;
+import com.limelight.nvstream.av.DecodeUnit;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.av.video.VideoDepacketizer;
+
+import android.annotation.TargetApi;
+import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaFormat;
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaCodec.CodecException;
+import android.os.Build;
+import android.view.SurfaceHolder;
+
+@SuppressWarnings("unused")
+public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
+
+	private ByteBuffer[] videoDecoderInputBuffers;
+	private MediaCodec videoDecoder;
+	private Thread rendererThread;
+	private boolean needsSpsBitstreamFixup, isExynos4;
+	private VideoDepacketizer depacketizer;
+	private boolean adaptivePlayback;
+	private int initialWidth, initialHeight;
+
+    private boolean needsBaselineSpsHack;
+    private SeqParameterSet savedSps;
+	
+	private long lastTimestampUs;
+	private long totalTimeMs;
+	private long decoderTimeMs;
+	private int totalFrames;
+	
+	private String decoderName;
+	private int numSpsIn;
+	private int numPpsIn;
+	private int numIframeIn;
+	
+	private static final boolean ENABLE_ASYNC_RENDERER = false;
+	
+	@TargetApi(Build.VERSION_CODES.KITKAT)
+	public MediaCodecDecoderRenderer() {
+		//dumpDecoders();
+		
+		MediaCodecInfo decoder = MediaCodecHelper.findProbableSafeDecoder();
+		if (decoder == null) {
+			decoder = MediaCodecHelper.findFirstDecoder();
+		}
+		if (decoder == null) {
+			// This case is handled later in setup()
+			return;
+		}
+		
+		decoderName = decoder.getName();
+		
+		// Set decoder-specific attributes
+		adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(decoderName, decoder);
+		needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(decoderName, decoder);
+        needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(decoderName, decoder);
+        isExynos4 = MediaCodecHelper.isExynos4Device();
+        if (needsSpsBitstreamFixup) {
+			LimeLog.info("Decoder "+decoderName+" needs SPS bitstream restrictions fixup");
+		}
+        if (needsBaselineSpsHack) {
+            LimeLog.info("Decoder "+decoderName+" needs baseline SPS hack");
+        }
+		if (isExynos4) {
+			LimeLog.info("Decoder "+decoderName+" is on Exynos 4");
+		}
+	}
+	
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	@Override
+	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+		this.initialWidth = width;
+		this.initialHeight = height;
+		
+		if (decoderName == null) {
+			LimeLog.severe("No available hardware decoder!");
+			return false;
+		}
+		
+		// Codecs have been known to throw all sorts of crazy runtime exceptions
+		// due to implementation problems
+		try {
+			videoDecoder = MediaCodec.createByCodecName(decoderName);
+		} catch (Exception e) {
+			return false;
+		}
+		
+		MediaFormat videoFormat = MediaFormat.createVideoFormat("video/avc", width, height);
+		
+		// Adaptive playback can also be enabled by the whitelist on pre-KitKat devices
+		// so we don't fill these pre-KitKat
+		if (adaptivePlayback && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			videoFormat.setInteger(MediaFormat.KEY_MAX_WIDTH, width);
+			videoFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, height);
+		}
+		
+		// On Lollipop, we use asynchronous mode to avoid having a busy looping renderer thread
+		if (ENABLE_ASYNC_RENDERER && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			videoDecoder.setCallback(new MediaCodec.Callback() {
+				@Override
+				public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
+			    	LimeLog.info("Output format changed");
+			    	LimeLog.info("New output Format: " + format);
+				}
+				
+				@Override
+				public void onOutputBufferAvailable(MediaCodec codec, int index,
+						BufferInfo info) {
+					try {
+						// FIXME: It looks like we can't frameskip here
+						codec.releaseOutputBuffer(index, true);
+					} catch (Exception e) {
+						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+					}
+				}
+				
+				@Override
+				public void onInputBufferAvailable(MediaCodec codec, int index) {
+					try {
+						submitDecodeUnit(depacketizer.takeNextDecodeUnit(), codec.getInputBuffer(index), index);
+					} catch (InterruptedException e) {
+						// What do we do here?
+						e.printStackTrace();
+					} catch (Exception e) {
+						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+					}
+				}
+				
+				@Override
+				public void onError(MediaCodec codec, CodecException e) {
+					if (e.isTransient()) {
+						LimeLog.warning(e.getDiagnosticInfo());
+						e.printStackTrace();
+					}
+					else {
+						LimeLog.severe(e.getDiagnosticInfo());
+						e.printStackTrace();
+					}
+				}
+			});
+		}
+		
+		videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
+		videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+		
+		LimeLog.info("Using hardware decoding");
+		
+		return true;
+	}
+	
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	private void handleDecoderException(MediaCodecDecoderRenderer dr, Exception e, ByteBuffer buf, int codecFlags) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			if (e instanceof CodecException) {
+				CodecException codecExc = (CodecException) e;
+				
+				if (codecExc.isTransient()) {
+					// We'll let transient exceptions go
+					LimeLog.warning(codecExc.getDiagnosticInfo());
+					return;
+				}
+				
+				LimeLog.severe(codecExc.getDiagnosticInfo());
+			}
+		}
+		
+		if (buf != null || codecFlags != 0) {
+			throw new RendererException(dr, e, buf, codecFlags);
+		}
+		else {
+			throw new RendererException(dr, e);
+		}
+	}
+	
+	private void startRendererThread()
+	{
+		rendererThread = new Thread() {
+			@SuppressWarnings("deprecation")
+			@Override
+			public void run() {
+				BufferInfo info = new BufferInfo();
+				DecodeUnit du = null;
+				int inputIndex = -1;
+				while (!isInterrupted())
+				{
+					// In order to get as much data to the decoder as early as possible,
+					// try to submit up to 5 decode units at once without blocking.
+					if (inputIndex == -1 && du == null) {
+						try {
+							for (int i = 0; i < 5; i++) {
+								inputIndex = videoDecoder.dequeueInputBuffer(0);
+								du = depacketizer.pollNextDecodeUnit();
+
+								// Stop if we can't get a DU or input buffer
+								if (du == null || inputIndex == -1) {
+									break;
+								}
+								
+								submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+								
+								du = null;
+								inputIndex = -1;
+							}
+						} catch (Exception e) {
+							inputIndex = -1;
+							handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+						}
+					}
+					
+					// Grab an input buffer if we don't have one already.
+					// This way we can have one ready hopefully by the time
+					// the depacketizer is done with this frame. It's important
+					// that this can timeout because it's possible that we could exhaust
+					// the decoder's input buffers and deadlocks because aren't pulling
+					// frames out of the other end.
+					if (inputIndex == -1) {
+						try {
+							// If we've got a DU waiting to be given to the decoder, 
+							// wait a full 3 ms for an input buffer. Otherwise
+							// just see if we can get one immediately.
+							inputIndex = videoDecoder.dequeueInputBuffer(du != null ? 3000 : 0);
+						} catch (Exception e) {
+							inputIndex = -1;
+							handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+						}
+					}
+					
+					// Grab a decode unit if we don't have one already
+					if (du == null) {
+						du = depacketizer.pollNextDecodeUnit();
+					}
+					
+					// If we've got both a decode unit and an input buffer, we'll
+					// submit now. Otherwise, we wait until we have one.
+					if (du != null && inputIndex >= 0) {
+						submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+						
+						// DU and input buffer have both been consumed
+						du = null;
+						inputIndex = -1;
+					}
+					
+					// Try to output a frame
+					try {
+						int outIndex = videoDecoder.dequeueOutputBuffer(info, 0);
+
+					    if (outIndex >= 0) {
+					    	long presentationTimeUs = info.presentationTimeUs;
+						    int lastIndex = outIndex;
+						    
+						    // Get the last output buffer in the queue
+						    while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
+						    	videoDecoder.releaseOutputBuffer(lastIndex, false);
+						    	lastIndex = outIndex;
+						    	presentationTimeUs = info.presentationTimeUs;
+						    }
+						    
+						    // Render the last buffer
+					    	videoDecoder.releaseOutputBuffer(lastIndex, true);
+					    	
+						    // Add delta time to the totals (excluding probable outliers)
+						    long delta = System.currentTimeMillis()-(presentationTimeUs/1000);
+						    if (delta >= 0 && delta < 1000) {
+						    	decoderTimeMs += delta;
+							    totalTimeMs += delta;
+						    }
+					    } else {
+						    switch (outIndex) {
+						    case MediaCodec.INFO_TRY_AGAIN_LATER:
+						    	// Getting an input buffer may already block
+						    	// so don't park if we still need to do that
+						    	if (inputIndex >= 0) {
+							    	LockSupport.parkNanos(1);
+						    	}
+						    	break;
+						    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
+						    	LimeLog.info("Output buffers changed");
+							    break;
+						    case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
+						    	LimeLog.info("Output format changed");
+						    	LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
+						    	break;
+						    default:
+						      break;
+						    }
+					    }
+					} catch (Exception e) {
+						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+					}
+				}
+			}
+		};
+		rendererThread.setName("Video - Renderer (MediaCodec)");
+		rendererThread.setPriority(Thread.MAX_PRIORITY);
+		rendererThread.start();
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public boolean start(VideoDepacketizer depacketizer) {
+		this.depacketizer = depacketizer;
+		
+		// Start the decoder
+		videoDecoder.start();
+		
+		// On devices pre-Lollipop, we'll use a rendering thread
+		if (!ENABLE_ASYNC_RENDERER || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+			videoDecoderInputBuffers = videoDecoder.getInputBuffers();
+			startRendererThread();
+		}
+		return true;
+	}
+
+	@Override
+	public void stop() {
+		if (rendererThread != null) {
+			// Halt the rendering thread
+			rendererThread.interrupt();
+			try {
+				rendererThread.join();
+			} catch (InterruptedException ignored) { }
+		}
+		
+		// Stop the decoder
+		videoDecoder.stop();
+	}
+
+	@Override
+	public void release() {
+		if (videoDecoder != null) {
+			videoDecoder.release();
+		}
+	}
+	
+	private void queueInputBuffer(int inputBufferIndex, int offset, int length, long timestampUs, int codecFlags) {
+		// Try 25 times to submit the input buffer before throwing a real exception
+		int i;
+		Exception lastException = null;
+		
+		for (i = 0; i < 25; i++) {
+			try {
+				videoDecoder.queueInputBuffer(inputBufferIndex,
+						0, length,
+						timestampUs, codecFlags);
+				break;
+			} catch (Exception e) {
+				handleDecoderException(this, e, null, codecFlags);
+				lastException = e;
+			}
+		}
+		
+		if (i == 25) {
+			throw new RendererException(this, lastException, null, codecFlags);
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	private void submitDecodeUnit(DecodeUnit decodeUnit, ByteBuffer buf, int inputBufferIndex) {
+		long currentTime = System.currentTimeMillis();
+		long delta = currentTime-decodeUnit.getReceiveTimestamp();
+		if (delta >= 0 && delta < 1000) {
+		    totalTimeMs += currentTime-decodeUnit.getReceiveTimestamp();
+		    totalFrames++;
+		}
+		
+		long timestampUs = currentTime * 1000;
+		if (timestampUs <= lastTimestampUs) {
+			// We can't submit multiple buffers with the same timestamp
+			// so bump it up by one before queuing
+			timestampUs = lastTimestampUs + 1;
+		}
+		lastTimestampUs = timestampUs;
+		
+		// Clear old input data
+		buf.clear();
+		
+		int codecFlags = 0;
+		int decodeUnitFlags = decodeUnit.getFlags();
+		if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
+			codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
+		}
+		if ((decodeUnitFlags & DecodeUnit.DU_FLAG_SYNC_FRAME) != 0) {
+			codecFlags |= MediaCodec.BUFFER_FLAG_SYNC_FRAME;
+			numIframeIn++;
+		}
+
+        boolean needsSpsReplay = false;
+		
+		if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
+			ByteBufferDescriptor header = decodeUnit.getBufferList().get(0);
+			if (header.data[header.offset+4] == 0x67) {
+				numSpsIn++;
+				
+				ByteBuffer spsBuf = ByteBuffer.wrap(header.data);
+				
+				// Skip to the start of the NALU data
+				spsBuf.position(header.offset+5);
+				
+				SeqParameterSet sps = SeqParameterSet.read(spsBuf);
+
+                // Some decoders rely on H264 level to decide how many buffers are needed
+                // Since we only need one frame buffered, we'll set the level as low as we can
+                // for known resolution combinations
+                if (initialWidth == 1280 && initialHeight == 720) {
+                    // Max 5 buffered frames at 1280x720x60
+                    LimeLog.info("Patching level_idc to 32");
+                    sps.level_idc = 32;
+                }
+                else if (initialWidth == 1920 && initialHeight == 1080) {
+                    // Max 4 buffered frames at 1920x1080x64
+                    LimeLog.info("Patching level_idc to 42");
+                    sps.level_idc = 42;
+                }
+                else {
+                    // Leave the profile alone (currently 5.0)
+                }
+				
+				// TI OMAP4 requires a reference frame count of 1 to decode successfully. Exynos 4
+				// also requires this fixup.
+				//
+				// I'm doing this fixup for all devices because I haven't seen any devices that
+				// this causes issues for. At worst, it seems to do nothing and at best it fixes
+				// issues with video lag, hangs, and crashes.
+				LimeLog.info("Patching num_ref_frames in SPS");
+				sps.num_ref_frames = 1;
+				
+				if (needsSpsBitstreamFixup || isExynos4) {
+					// The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
+					// or max_dec_frame_buffering which increases decoding latency on Tegra.
+					LimeLog.info("Adding bitstream restrictions");
+
+					sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
+					sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
+					sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
+					sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
+					sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
+					sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
+					sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
+					sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = 1;
+				}
+
+                // If we need to hack this SPS to say we're baseline, do so now
+                if (needsBaselineSpsHack) {
+                    LimeLog.info("Hacking SPS to baseline");
+                    sps.profile_idc = 66;
+                    savedSps = sps;
+                }
+				
+				// Write the annex B header
+				buf.put(header.data, header.offset, 5);
+				
+				// Write the modified SPS to the input buffer
+				sps.write(buf);
+				
+				queueInputBuffer(inputBufferIndex,
+						0, buf.position(),
+						timestampUs, codecFlags);
+				
+				depacketizer.freeDecodeUnit(decodeUnit);
+				return;
+			} else if (header.data[header.offset+4] == 0x68) {
+				numPpsIn++;
+
+                if (needsBaselineSpsHack) {
+                    LimeLog.info("Saw PPS; disabling SPS hack");
+                    needsBaselineSpsHack = false;
+
+                    // Give the decoder the SPS again with the proper profile now
+                    needsSpsReplay = true;
+                }
+			}
+		}
+
+		// Copy data from our buffer list into the input buffer
+		for (ByteBufferDescriptor desc : decodeUnit.getBufferList())
+		{
+			buf.put(desc.data, desc.offset, desc.length);
+		}
+
+		queueInputBuffer(inputBufferIndex,
+				0, decodeUnit.getDataLength(),
+				timestampUs, codecFlags);
+		
+		depacketizer.freeDecodeUnit(decodeUnit);
+
+        if (needsSpsReplay) {
+            replaySps();
+        }
+	}
+
+    private void replaySps() {
+        int inputIndex = videoDecoder.dequeueInputBuffer(-1);
+        ByteBuffer inputBuffer = videoDecoderInputBuffers[inputIndex];
+
+        inputBuffer.clear();
+
+        // Write the Annex B header
+        inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67});
+
+        // Switch the H264 profile back to high
+        savedSps.profile_idc = 100;
+
+        // Write the SPS data
+        savedSps.write(inputBuffer);
+
+        // No need for the SPS anymore
+        savedSps = null;
+
+        // Queue the new SPS
+        queueInputBuffer(inputIndex,
+                0, inputBuffer.position(),
+                System.currentTimeMillis() * 1000,
+                MediaCodec.BUFFER_FLAG_CODEC_CONFIG);
+
+        LimeLog.info("SPS replay complete");
+    }
+
+	@Override
+	public int getCapabilities() {
+		return adaptivePlayback ?
+				VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION : 0;
+	}
+
+	@Override
+	public int getAverageDecoderLatency() {
+		if (totalFrames == 0) {
+			return 0;
+		}
+		return (int)(decoderTimeMs / totalFrames);
+	}
+
+	@Override
+	public int getAverageEndToEndLatency() {
+		if (totalFrames == 0) {
+			return 0;
+		}
+		return (int)(totalTimeMs / totalFrames);
+	}
+
+    @Override
+    public String getDecoderName() {
+        return decoderName;
+    }
+
+    public class RendererException extends RuntimeException {
+		private static final long serialVersionUID = 8985937536997012406L;
+		
+		private Exception originalException;
+		private MediaCodecDecoderRenderer renderer;
+		private ByteBuffer currentBuffer;
+		private int currentCodecFlags;
+		
+		public RendererException(MediaCodecDecoderRenderer renderer, Exception e) {
+			this.renderer = renderer;
+			this.originalException = e;
+		}
+		
+		public RendererException(MediaCodecDecoderRenderer renderer, Exception e, ByteBuffer currentBuffer, int currentCodecFlags) {
+			this.renderer = renderer;
+			this.originalException = e;
+			this.currentBuffer = currentBuffer;
+			this.currentCodecFlags = currentCodecFlags;
+		}
+		
+		public String toString() {
+			String str = "";
+			
+			str += "Decoder: "+renderer.decoderName+"\n";
+			str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
+			str += "In stats: "+renderer.numSpsIn+", "+renderer.numPpsIn+", "+renderer.numIframeIn+"\n";
+			str += "Total frames: "+renderer.totalFrames+"\n";
+			
+			if (currentBuffer != null) {
+				str += "Current buffer: ";
+				currentBuffer.flip();
+				while (currentBuffer.hasRemaining() && currentBuffer.position() < 10) {
+					str += String.format((Locale)null, "%02x ", currentBuffer.get());
+				}
+				str += "\n";
+				str += "Buffer codec flags: "+currentCodecFlags+"\n";
+			}
+			
+			str += "Is Exynos 4: "+renderer.isExynos4+"\n";
+			
+			str += "/proc/cpuinfo:\n";
+			try {
+				str += MediaCodecHelper.readCpuinfo();
+			} catch (Exception e) {
+				str += e.getMessage();
+			}
+			
+			str += "Full decoder dump:\n";
+			try {
+				str += MediaCodecHelper.dumpDecoders();
+			} catch (Exception e) {
+				str += e.getMessage();
+			}
+			
+			str += originalException.toString();
+			
+			return str;
+		}
+	}
+}

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

@@ -0,0 +1,313 @@
+package com.limelight.binding.video;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.media.MediaCodecInfo;
+import android.media.MediaCodecList;
+import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecInfo.CodecProfileLevel;
+import android.os.Build;
+
+import com.limelight.LimeLog;
+
+public class MediaCodecHelper {
+	
+	public static final List<String> preferredDecoders;
+
+	public static final List<String> blacklistedDecoderPrefixes;
+	public static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
+	public static final List<String> whitelistedAdaptiveResolutionPrefixes;
+    public static final List<String> baselineProfileHackPrefixes;
+	
+	static {
+		preferredDecoders = new LinkedList<String>();
+	}
+	
+	static {
+		blacklistedDecoderPrefixes = new LinkedList<String>();
+		
+		// Software decoders that don't support H264 high profile
+		blacklistedDecoderPrefixes.add("omx.google");
+		blacklistedDecoderPrefixes.add("AVCDecoder");
+	}
+	
+	static {
+		spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<String>();
+		spsFixupBitstreamFixupDecoderPrefixes.add("omx.nvidia");
+		spsFixupBitstreamFixupDecoderPrefixes.add("omx.qcom");
+		spsFixupBitstreamFixupDecoderPrefixes.add("omx.mtk");
+        spsFixupBitstreamFixupDecoderPrefixes.add("omx.brcm");
+
+        baselineProfileHackPrefixes = new LinkedList<String>();
+        baselineProfileHackPrefixes.add("omx.intel");
+
+		whitelistedAdaptiveResolutionPrefixes = new LinkedList<String>();
+		whitelistedAdaptiveResolutionPrefixes.add("omx.nvidia");
+		whitelistedAdaptiveResolutionPrefixes.add("omx.qcom");
+		whitelistedAdaptiveResolutionPrefixes.add("omx.sec");
+		whitelistedAdaptiveResolutionPrefixes.add("omx.TI");
+	}
+
+	private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
+		for (String badPrefix : decoderList) {
+			if (decoderName.length() >= badPrefix.length()) {
+				String prefix = decoderName.substring(0, badPrefix.length());
+				if (prefix.equalsIgnoreCase(badPrefix)) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	@TargetApi(Build.VERSION_CODES.KITKAT)
+	public static boolean decoderSupportsAdaptivePlayback(String decoderName, MediaCodecInfo decoderInfo) {
+		/*
+		FIXME: Intel's decoder on Nexus Player forces the high latency path if adaptive playback is enabled
+		so we'll keep it off for now, since we don't know whether other devices also do the same
+
+		if (isDecoderInList(whitelistedAdaptiveResolutionPrefixes, decoderName)) {
+			LimeLog.info("Adaptive playback supported (whitelist)");
+			return true;
+		}
+		
+		// Possibly enable adaptive playback on KitKat and above
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			try {
+				if (decoderInfo.getCapabilitiesForType("video/avc").
+						isFeatureSupported(CodecCapabilities.FEATURE_AdaptivePlayback))
+				{
+					// This will make getCapabilities() return that adaptive playback is supported
+					LimeLog.info("Adaptive playback supported (FEATURE_AdaptivePlayback)");
+					return true;
+				}
+			} catch (Exception e) {
+				// Tolerate buggy codecs
+			}
+		}*/
+		
+		return false;
+	}
+	
+	public static boolean decoderNeedsSpsBitstreamRestrictions(String decoderName, MediaCodecInfo decoderInfo) {
+		return isDecoderInList(spsFixupBitstreamFixupDecoderPrefixes, decoderName);
+	}
+
+    public static boolean decoderNeedsBaselineSpsHack(String decoderName, MediaCodecInfo decoderInfo) {
+        return isDecoderInList(baselineProfileHackPrefixes, decoderName);
+    }
+	
+	@SuppressWarnings("deprecation")
+	@SuppressLint("NewApi")
+	private static LinkedList<MediaCodecInfo> getMediaCodecList() {
+		LinkedList<MediaCodecInfo> infoList = new LinkedList<MediaCodecInfo>();
+		
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+            Collections.addAll(infoList, mcl.getCodecInfos());
+		}
+		else {
+			for (int i = 0; i < MediaCodecList.getCodecCount(); i++) {
+				infoList.add(MediaCodecList.getCodecInfoAt(i));
+			}	
+		}
+		
+		return infoList;
+	}
+	
+	@SuppressWarnings("RedundantThrows")
+    public static String dumpDecoders() throws Exception {
+		String str = "";
+		for (MediaCodecInfo codecInfo : getMediaCodecList()) {
+			// Skip encoders
+			if (codecInfo.isEncoder()) {
+				continue;
+			}
+			
+			str += "Decoder: "+codecInfo.getName()+"\n";
+			for (String type : codecInfo.getSupportedTypes()) {
+				str += "\t"+type+"\n";
+				CodecCapabilities caps = codecInfo.getCapabilitiesForType(type);
+				
+				for (CodecProfileLevel profile : caps.profileLevels) {
+					str += "\t\t"+profile.profile+" "+profile.level+"\n";
+				}
+			}
+		}
+		return str;
+	}
+	
+	public static MediaCodecInfo findPreferredDecoder() {
+		// This is a different algorithm than the other findXXXDecoder functions,
+		// because we want to evaluate the decoders in our list's order
+		// rather than MediaCodecList's order
+		
+		for (String preferredDecoder : preferredDecoders) {
+			for (MediaCodecInfo codecInfo : getMediaCodecList()) {
+				// Skip encoders
+				if (codecInfo.isEncoder()) {
+					continue;
+				}
+				
+				// Check for preferred decoders
+				if (preferredDecoder.equalsIgnoreCase(codecInfo.getName())) {
+					LimeLog.info("Preferred decoder choice is "+codecInfo.getName());
+					return codecInfo;
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	public static MediaCodecInfo findFirstDecoder() {
+		for (MediaCodecInfo codecInfo : getMediaCodecList()) {
+			// Skip encoders
+			if (codecInfo.isEncoder()) {
+				continue;
+			}
+			
+			// Check for explicitly blacklisted decoders
+			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
+				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
+				continue;
+			}
+			
+			// Find a decoder that supports H.264
+			for (String mime : codecInfo.getSupportedTypes()) {
+				if (mime.equalsIgnoreCase("video/avc")) {
+					LimeLog.info("First decoder choice is "+codecInfo.getName());
+					return codecInfo;
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	public static MediaCodecInfo findProbableSafeDecoder() {
+		// First look for a preferred decoder by name
+		MediaCodecInfo info = findPreferredDecoder();
+		if (info != null) {
+			return info;
+		}
+		
+		// Now look for decoders we know are safe
+		try {
+			// If this function completes, it will determine if the decoder is safe
+			return findKnownSafeDecoder();
+		} catch (Exception e) {
+			// Some buggy devices seem to throw exceptions
+			// from getCapabilitiesForType() so we'll just assume
+			// they're okay and go with the first one we find
+			return findFirstDecoder();
+		}
+	}
+
+	// We declare this method as explicitly throwing Exception
+	// since some bad decoders can throw IllegalArgumentExceptions unexpectedly
+	// and we want to be sure all callers are handling this possibility
+	@SuppressWarnings("RedundantThrows")
+    public static MediaCodecInfo findKnownSafeDecoder() throws Exception {
+		for (MediaCodecInfo codecInfo : getMediaCodecList()) {		
+			// Skip encoders
+			if (codecInfo.isEncoder()) {
+				continue;
+			}
+			
+			// Check for explicitly blacklisted decoders
+			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
+				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
+				continue;
+			}
+			
+			// Find a decoder that supports H.264 high profile
+			for (String mime : codecInfo.getSupportedTypes()) {
+				if (mime.equalsIgnoreCase("video/avc")) {
+					LimeLog.info("Examining decoder capabilities of "+codecInfo.getName());
+					
+					CodecCapabilities caps = codecInfo.getCapabilitiesForType(mime);
+					for (CodecProfileLevel profile : caps.profileLevels) {
+						if (profile.profile == CodecProfileLevel.AVCProfileHigh) {
+							LimeLog.info("Decoder "+codecInfo.getName()+" supports high profile");
+							LimeLog.info("Selected decoder: "+codecInfo.getName());
+							return codecInfo;
+						}
+					}
+					
+					LimeLog.info("Decoder "+codecInfo.getName()+" does NOT support high profile");
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	public static String readCpuinfo() throws Exception {
+		StringBuilder cpuInfo = new StringBuilder();
+		BufferedReader br = new BufferedReader(new FileReader(new File("/proc/cpuinfo")));
+		try {
+			for (;;) {
+				int ch = br.read();
+				if (ch == -1)
+					break;
+				cpuInfo.append((char)ch);
+			}
+			
+			return cpuInfo.toString();
+		} finally {
+			br.close();
+		}
+	}
+	
+	private static boolean stringContainsIgnoreCase(String string, String substring) {
+		return string.toLowerCase(Locale.ENGLISH).contains(substring.toLowerCase(Locale.ENGLISH));
+	}
+	
+	public static boolean isExynos4Device() {
+		try {
+			// Try reading CPU info too look for 
+			String cpuInfo = readCpuinfo();
+			
+			// SMDK4xxx is Exynos 4 
+			if (stringContainsIgnoreCase(cpuInfo, "SMDK4")) {
+				LimeLog.info("Found SMDK4 in /proc/cpuinfo");
+				return true;
+			}
+			
+			// If we see "Exynos 4" also we'll count it
+			if (stringContainsIgnoreCase(cpuInfo, "Exynos 4")) {
+				LimeLog.info("Found Exynos 4 in /proc/cpuinfo");
+				return true;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		try {
+			File systemDir = new File("/sys/devices/system");
+			File[] files = systemDir.listFiles();
+			if (files != null) {
+				for (File f : files) {
+					if (stringContainsIgnoreCase(f.getName(), "exynos4")) {
+						LimeLog.info("Found exynos4 in /sys/devices/system");
+						return true;
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		return false;
+	}
+}

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

@@ -4,6 +4,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.UUID;
 
 import com.limelight.LimeLog;
@@ -44,7 +45,7 @@ public class ComputerDatabaseManager {
 	
 	private void initializeDb() {
 		// Create tables if they aren't already there
-		computerDb.execSQL(String.format("CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY," +
+		computerDb.execSQL(String.format((Locale)null, "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY," +
 				" %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL)",
 				COMPUTER_TABLE_NAME,
 				COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
@@ -98,15 +99,17 @@ public class ComputerDatabaseManager {
 			details.macAddress = c.getString(4);
 			
 			// This signifies we don't have dynamic state (like pair state)
-			details.state = ComputerDetails.State.UNKNOWN;
+            details.state = ComputerDetails.State.UNKNOWN;
+            details.reachability = ComputerDetails.Reachability.UNKNOWN;
 			
 			// If a field is corrupt or missing, skip the database entry
 			if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
 					details.macAddress == null) {
 				continue;
 			}
-			
+
-			computerList.add(details);
+
+            computerList.add(details);
 		}
 		
 		c.close();
@@ -150,6 +153,9 @@ public class ComputerDatabaseManager {
 		details.macAddress = c.getString(4);
 		
 		c.close();
+
+        details.state = ComputerDetails.State.UNKNOWN;
+        details.reachability = ComputerDetails.Reachability.UNKNOWN;
 		
 		// If a field is corrupt or missing, delete the database entry
 		if (details.uuid == null || details.localIp == null || details.remoteIp == null ||

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

@@ -0,0 +1,470 @@
+package com.limelight.computers;
+
+import java.net.InetAddress;
+import java.util.LinkedList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.limelight.LimeLog;
+import com.limelight.binding.PlatformBinding;
+import com.limelight.discovery.DiscoveryService;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.mdns.MdnsComputer;
+import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
+
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Binder;
+import android.os.IBinder;
+
+public class ComputerManagerService extends Service {
+	private static final int POLLING_PERIOD_MS = 3000;
+	private static final int MDNS_QUERY_PERIOD_MS = 1000;
+	
+	private ComputerManagerBinder binder = new ComputerManagerBinder();
+	
+	private ComputerDatabaseManager dbManager;
+	private AtomicInteger dbRefCount = new AtomicInteger(0);
+	
+	private IdentityManager idManager;
+	private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
+	private ComputerManagerListener listener = null;
+	private AtomicInteger activePolls = new AtomicInteger(0);
+    private boolean pollingActive = false;
+
+	private DiscoveryService.DiscoveryBinder discoveryBinder;
+	private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
+		public void onServiceConnected(ComponentName className, IBinder binder) {
+			synchronized (discoveryServiceConnection) {
+				DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
+				
+				// Set us as the event listener
+				privateBinder.setListener(createDiscoveryListener());
+				
+				// Signal a possible waiter that we're all setup
+				discoveryBinder = privateBinder;
+				discoveryServiceConnection.notifyAll();
+			}
+		}
+
+		public void onServiceDisconnected(ComponentName className) {
+			discoveryBinder = null;
+		}
+	};
+
+    // Returns true if the details object was modified
+    private boolean runPoll(ComputerDetails details)
+    {
+        boolean newPc = details.name.isEmpty();
+
+        if (!getLocalDatabaseReference()) {
+            return false;
+        }
+
+        activePolls.incrementAndGet();
+
+        // Poll the machine
+        if (!doPollMachine(details)) {
+            details.state = ComputerDetails.State.OFFLINE;
+            details.reachability = ComputerDetails.Reachability.OFFLINE;
+        }
+
+        activePolls.decrementAndGet();
+
+        // If it's online, update our persistent state
+        if (details.state == ComputerDetails.State.ONLINE) {
+            if (!newPc) {
+                // Check if it's in the database because it could have been
+                // removed after this was issued
+                if (dbManager.getComputerByName(details.name) == null) {
+                    // It's gone
+                    releaseLocalDatabaseReference();
+                    return true;
+                }
+            }
+
+            dbManager.updateComputer(details);
+        }
+
+        // Don't call the listener if this is a failed lookup of a new PC
+        if ((!newPc || details.state == ComputerDetails.State.ONLINE) && listener != null) {
+            listener.notifyComputerUpdated(details);
+        }
+
+        releaseLocalDatabaseReference();
+        return true;
+    }
+
+    private Thread createPollingThread(final ComputerDetails details) {
+        Thread t = new Thread() {
+            @Override
+            public void run() {
+                while (!isInterrupted() && pollingActive) {
+                    // Check if this poll has modified the details
+                    runPoll(details);
+
+                    // Wait until the next polling interval
+                    try {
+                        Thread.sleep(POLLING_PERIOD_MS);
+                    } catch (InterruptedException e) {
+                        break;
+                    }
+                }
+            }
+        };
+        t.setName("Polling thread for "+details.localIp.getHostAddress());
+        return t;
+    }
+	
+	public class ComputerManagerBinder extends Binder {
+		public void startPolling(ComputerManagerListener listener) {
+            // Polling is active
+            pollingActive = true;
+
+			// Set the listener
+			ComputerManagerService.this.listener = listener;
+			
+			// Start mDNS autodiscovery too
+			discoveryBinder.startDiscovery(MDNS_QUERY_PERIOD_MS);
+
+            synchronized (pollingTuples) {
+                for (PollingTuple tuple : pollingTuples) {
+                    // This polling thread might already be there
+                    if (tuple.thread == null) {
+                        // Report this computer initially
+                        listener.notifyComputerUpdated(tuple.computer);
+
+                        tuple.thread = createPollingThread(tuple.computer);
+                        tuple.thread.start();
+                    }
+                }
+            }
+		}
+		
+		public void waitForReady() {
+			synchronized (discoveryServiceConnection) {
+				try {
+					while (discoveryBinder == null) {
+						// Wait for the bind notification
+						discoveryServiceConnection.wait(1000);
+					}
+				} catch (InterruptedException ignored) {
+				}
+			}
+		}
+		
+		public void waitForPollingStopped() {
+			while (activePolls.get() != 0) {
+				try {
+					Thread.sleep(250);
+				} catch (InterruptedException ignored) {}
+			}
+		}
+		
+		public boolean addComputerBlocking(InetAddress addr) {
+			return ComputerManagerService.this.addComputerBlocking(addr);
+		}
+		
+		public void addComputer(InetAddress addr) {
+			ComputerManagerService.this.addComputer(addr);
+		}
+		
+		public void removeComputer(String name) {
+			ComputerManagerService.this.removeComputer(name);
+		}
+		
+		public void stopPolling() {
+			// Just call the unbind handler to cleanup
+			ComputerManagerService.this.onUnbind(null);
+		}
+		
+		public String getUniqueId() {
+			return idManager.getUniqueId();
+		}
+	}
+	
+	@Override
+	public boolean onUnbind(Intent intent) {
+		// Stop mDNS autodiscovery
+		discoveryBinder.stopDiscovery();
+		
+		// Stop polling
+        pollingActive = false;
+        synchronized (pollingTuples) {
+            for (PollingTuple tuple : pollingTuples) {
+                if (tuple.thread != null) {
+                    // Interrupt and remove the thread
+                    tuple.thread.interrupt();
+                    tuple.thread = null;
+                }
+            }
+        }
+		
+		// Remove the listener
+		listener = null;
+		
+		return false;
+	}
+	
+	private MdnsDiscoveryListener createDiscoveryListener() {
+		return new MdnsDiscoveryListener() {
+			@Override
+			public void notifyComputerAdded(MdnsComputer computer) {
+				// Kick off a serverinfo poll on this machine
+				addComputer(computer.getAddress());
+			}
+
+			@Override
+			public void notifyComputerRemoved(MdnsComputer computer) {
+				// Nothing to do here
+			}
+
+			@Override
+			public void notifyDiscoveryFailure(Exception e) {
+				LimeLog.severe("mDNS discovery failed");
+				e.printStackTrace();
+			}
+		};
+	}
+
+	public void addComputer(InetAddress addr) {
+		// Setup a placeholder
+		ComputerDetails fakeDetails = new ComputerDetails();
+		fakeDetails.localIp = addr;
+		fakeDetails.remoteIp = addr;
+        fakeDetails.name = "";
+
+        addTuple(fakeDetails);
+	}
+
+    private void addTuple(ComputerDetails details) {
+        synchronized (pollingTuples) {
+            for (PollingTuple tuple : pollingTuples) {
+                // Check if this is the same computer
+                if (tuple.computer == details ||
+                        // If there's no name on one of these computers, compare with the local IP
+                        ((details.name.isEmpty() || tuple.computer.name.isEmpty()) &&
+                                tuple.computer.localIp.equals(details.localIp)) ||
+                        // If there is a name on both computers, compare with name
+                        ((!details.name.isEmpty() && !tuple.computer.name.isEmpty()) &&
+                                tuple.computer.name.equals(details.name))) {
+
+                    // Start a polling thread if polling is active
+                    if (pollingActive && tuple.thread == null) {
+                        tuple.thread = createPollingThread(details);
+                        tuple.thread.start();
+                    }
+
+                    // Found an entry so we're done
+                    return;
+                }
+            }
+
+            // If we got here, we didn't find an entry
+            PollingTuple tuple = new PollingTuple(details, pollingActive ? createPollingThread(details) : null);
+            pollingTuples.add(tuple);
+            if (tuple.thread != null) {
+                tuple.thread.start();
+            }
+        }
+    }
+
+	public boolean addComputerBlocking(InetAddress addr) {
+		// Setup a placeholder
+		ComputerDetails fakeDetails = new ComputerDetails();
+		fakeDetails.localIp = addr;
+		fakeDetails.remoteIp = addr;
+        fakeDetails.name = "";
+		
+		// Block while we try to fill the details
+        runPoll(fakeDetails);
+		
+		// If the machine is reachable, it was successful
+		if (fakeDetails.state == ComputerDetails.State.ONLINE) {
+            // Start a polling thread for this machine
+            addTuple(fakeDetails);
+            return true;
+        }
+        else {
+            return false;
+        }
+	}
+	
+	public void removeComputer(String name) {
+		if (!getLocalDatabaseReference()) {
+			return;
+		}
+		
+		// Remove it from the database
+		dbManager.deleteComputer(name);
+
+        synchronized (pollingTuples) {
+            // Remove the computer from the computer list
+            for (PollingTuple tuple : pollingTuples) {
+                if (tuple.computer.name.equals(name)) {
+                    if (tuple.thread != null) {
+                        // Interrupt the thread on this entry
+                        tuple.thread.interrupt();
+                    }
+                    pollingTuples.remove(tuple);
+                    break;
+                }
+            }
+        }
+		
+		releaseLocalDatabaseReference();
+	}
+	
+	private boolean getLocalDatabaseReference() {
+		if (dbRefCount.get() == 0) {
+			return false;
+		}
+		
+		dbRefCount.incrementAndGet();
+		return true;
+	}
+	
+	private void releaseLocalDatabaseReference() {
+		if (dbRefCount.decrementAndGet() == 0) {
+			dbManager.close();
+		}
+	}
+	
+	private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
+		try {
+			NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
+					null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+
+			ComputerDetails newDetails = http.getComputerDetails();
+
+            // Check if this is the PC we expected
+            if (details.uuid != null && newDetails.uuid != null &&
+                    !details.uuid.equals(newDetails.uuid)) {
+                // We got the wrong PC!
+                LimeLog.info("Polling returned the wrong PC!");
+                return null;
+            }
+
+            return newDetails;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
+	private boolean pollComputer(ComputerDetails details, boolean localFirst) {
+		ComputerDetails polledDetails;
+
+        // If the local address is routable across the Internet,
+        // always consider this PC remote to be conservative
+        if (details.localIp.equals(details.remoteIp)) {
+            localFirst = false;
+        }
+		
+		if (localFirst) {
+			polledDetails = tryPollIp(details, details.localIp);
+		}
+		else {
+			polledDetails = tryPollIp(details, details.remoteIp);
+		}
+		
+		if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
+			// Failed, so let's try the fallback
+			if (!localFirst) {
+				polledDetails = tryPollIp(details, details.localIp);
+			}
+			else {
+				polledDetails = tryPollIp(details, details.remoteIp);
+			}
+			
+			// The fallback poll worked
+			if (polledDetails != null) {
+				polledDetails.reachability = !localFirst ? ComputerDetails.Reachability.LOCAL :
+					ComputerDetails.Reachability.REMOTE;
+			}
+		}
+		else if (polledDetails != null) {
+			polledDetails.reachability = localFirst ? ComputerDetails.Reachability.LOCAL :
+				ComputerDetails.Reachability.REMOTE;
+		}
+		
+		// Machine was unreachable both tries
+		if (polledDetails == null) {
+			return false;
+		}
+		
+		// If we got here, it's reachable
+		details.update(polledDetails);
+		return true;
+	}
+	
+	private boolean doPollMachine(ComputerDetails details) {
+        if (details.reachability == ComputerDetails.Reachability.UNKNOWN ||
+            details.reachability == ComputerDetails.Reachability.OFFLINE) {
+            // Always try local first to avoid potential UDP issues when
+            // attempting to stream via the router's external IP address
+            // behind its NAT
+            return pollComputer(details, true);
+        }
+        else {
+            // If we're already reached a machine via a particular IP address,
+            // always try that one first
+            return pollComputer(details, details.reachability == ComputerDetails.Reachability.LOCAL);
+        }
+	}
+	
+	@Override
+	public void onCreate() {
+		// Bind to the discovery service
+		bindService(new Intent(this, DiscoveryService.class),
+				discoveryServiceConnection, Service.BIND_AUTO_CREATE);
+		
+		// Lookup or generate this device's UID
+		idManager = new IdentityManager(this);
+		
+		// Initialize the DB
+		dbManager = new ComputerDatabaseManager(this);
+		dbRefCount.set(1);
+
+        // Grab known machines into our computer list
+        if (!getLocalDatabaseReference()) {
+            return;
+        }
+
+        for (ComputerDetails computer : dbManager.getAllComputers()) {
+            // Add tuples for each computer
+            addTuple(computer);
+        }
+
+        releaseLocalDatabaseReference();
+	}
+	
+	@Override
+	public void onDestroy() {
+		if (discoveryBinder != null) {
+			// Unbind from the discovery service
+			unbindService(discoveryServiceConnection);
+		}
+		
+		// FIXME: Should await termination here but we have timeout issues in HttpURLConnection
+		
+		// Remove the initial DB reference
+		releaseLocalDatabaseReference();
+	}
+	
+	@Override
+	public IBinder onBind(Intent intent) {
+		return binder;
+	}
+}
+
+class PollingTuple {
+    public Thread thread;
+    public ComputerDetails computer;
+
+    public PollingTuple(ComputerDetails computer, Thread thread) {
+        this.computer = computer;
+        this.thread = thread;
+    }
+}

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

@@ -4,6 +4,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.util.Locale;
 import java.util.Random;
 
 import com.limelight.LimeLog;
@@ -53,7 +54,7 @@ public class IdentityManager {
 			if (reader != null) {
 				try {
 					reader.close();
-				} catch (IOException e) {}
+				} catch (IOException ignored) {}
 			}
 		}
 	}
@@ -61,7 +62,7 @@ public class IdentityManager {
 	private static String generateNewUniqueId(Context c) {
 		// Generate a new UID hex string
 		LimeLog.info("Generating new UID");
-		String uidStr = String.format("%016x", new Random().nextLong());
+		String uidStr = String.format((Locale)null, "%016x", new Random().nextLong());
 		
 		OutputStreamWriter writer = null;
 		try {
@@ -75,7 +76,7 @@ public class IdentityManager {
 			if (writer != null) {
 				try {
 					writer.close();
-				} catch (IOException e) {}
+				} catch (IOException ignored) {}
 			}
 		}
 		

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

@@ -0,0 +1,169 @@
+package com.limelight.grid;
+
+import android.content.Context;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.koushikdutta.async.future.FutureCallback;
+import com.koushikdutta.ion.Ion;
+import com.limelight.AppView;
+import com.limelight.R;
+import com.limelight.binding.PlatformBinding;
+import com.limelight.nvstream.http.LimelightCryptoProvider;
+
+import java.net.InetAddress;
+import java.net.Socket;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.concurrent.Future;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.X509Certificate;
+
+public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
+
+    private InetAddress address;
+    private String uniqueId;
+    private LimelightCryptoProvider cryptoProvider;
+    private SSLContext sslContext;
+    private final HashMap<ImageView, Future> pendingRequests = new HashMap<ImageView, Future>();
+
+    public AppGridAdapter(Context context, InetAddress address, String uniqueId) throws NoSuchAlgorithmException, KeyManagementException {
+        super(context, R.layout.app_grid_item, R.drawable.image_loading);
+
+        this.address = address;
+        this.uniqueId = uniqueId;
+
+        cryptoProvider = PlatformBinding.getCryptoProvider(context);
+
+        sslContext = SSLContext.getInstance("SSL");
+        sslContext.init(ourKeyman, trustAllCerts, new SecureRandom());
+    }
+
+    TrustManager[] trustAllCerts = new TrustManager[] {
+            new X509TrustManager() {
+                public X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[0];
+                }
+                public void checkClientTrusted(X509Certificate[] certs, String authType) {}
+                public void checkServerTrusted(X509Certificate[] certs, String authType) {}
+            }};
+
+    KeyManager[] ourKeyman = new KeyManager[] {
+            new X509KeyManager() {
+                public String chooseClientAlias(String[] keyTypes,
+                                                Principal[] issuers, Socket socket) {
+                    return "Limelight-RSA";
+                }
+
+                public String chooseServerAlias(String keyType, Principal[] issuers,
+                                                Socket socket) {
+                    return null;
+                }
+
+                public X509Certificate[] getCertificateChain(String alias) {
+                    return new X509Certificate[] {cryptoProvider.getClientCertificate()};
+                }
+
+                public String[] getClientAliases(String keyType, Principal[] issuers) {
+                    return null;
+                }
+
+                public PrivateKey getPrivateKey(String alias) {
+                    return cryptoProvider.getClientPrivateKey();
+                }
+
+                public String[] getServerAliases(String keyType, Principal[] issuers) {
+                    return null;
+                }
+            }
+    };
+
+    // Ignore differences between given hostname and certificate hostname
+    HostnameVerifier hv = new HostnameVerifier() {
+        public boolean verify(String hostname, SSLSession session) { return true; }
+    };
+
+    public void addApp(AppView.AppObject app) {
+        itemList.add(app);
+    }
+
+    public void abortPendingRequests() {
+        HashMap<ImageView, Future> tempMap;
+
+        synchronized (pendingRequests) {
+            // Copy the pending requests under a lock
+            tempMap = new HashMap<ImageView, Future>(pendingRequests);
+        }
+
+        for (Future f : tempMap.values()) {
+            f.cancel(true);
+        }
+
+        synchronized (pendingRequests) {
+            // Remove cancelled requests
+            for (ImageView v : tempMap.keySet()) {
+                pendingRequests.remove(v);
+            }
+        }
+    }
+
+    @Override
+    public boolean populateImageView(final ImageView imgView, AppView.AppObject obj) {
+
+        // Set SSL contexts correctly to allow us to authenticate
+        Ion.getDefault(imgView.getContext()).getHttpClient().getSSLSocketMiddleware().setTrustManagers(trustAllCerts);
+        Ion.getDefault(imgView.getContext()).getHttpClient().getSSLSocketMiddleware().setSSLContext(sslContext);
+
+        // Set off the deferred image load
+        synchronized (pendingRequests) {
+            Future f = Ion.with(imgView)
+                    .placeholder(defaultImageRes)
+                    .error(defaultImageRes)
+                    .load("https://" + address.getHostAddress() + ":47984/appasset?uniqueid=" + uniqueId + "&appid=" +
+                            obj.app.getAppId() + "&AssetType=2&AssetIdx=0")
+                    .setCallback(new FutureCallback<ImageView>() {
+                        @Override
+                        public void onCompleted(Exception e, ImageView result) {
+                            synchronized (pendingRequests) {
+                                pendingRequests.remove(imgView);
+                            }
+                        }
+                    });
+            pendingRequests.put(imgView, f);
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean populateTextView(TextView txtView, AppView.AppObject obj) {
+        // Select the text view so it starts marquee mode
+        txtView.setSelected(true);
+
+        // Return false to use the app's toString method
+        return false;
+    }
+
+    @Override
+    public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
+        if (obj.app.getIsRunning()) {
+            // Show the play button overlay
+            overlayView.setImageResource(R.drawable.play);
+            return true;
+        }
+
+        // No overlay
+        return false;
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.limelight.grid;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.limelight.R;
+
+import java.util.ArrayList;
+
+public abstract class GenericGridAdapter<T> extends BaseAdapter {
+    protected Context context;
+    protected int defaultImageRes;
+    protected int layoutId;
+    protected ArrayList<T> itemList = new ArrayList<T>();
+    protected LayoutInflater inflater;
+
+    public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
+        this.context = context;
+        this.layoutId = layoutId;
+        this.defaultImageRes = defaultImageRes;
+
+        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    public void clear() {
+        itemList.clear();
+    }
+
+    @Override
+    public int getCount() {
+        return itemList.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return itemList.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+    public abstract boolean populateImageView(ImageView imgView, T obj);
+    public abstract boolean populateTextView(TextView txtView, T obj);
+    public abstract boolean populateOverlayView(ImageView overlayView, T obj);
+
+    @Override
+    public View getView(int i, View convertView, ViewGroup viewGroup) {
+        if (convertView == null) {
+            convertView = inflater.inflate(layoutId, viewGroup, false);
+        }
+
+        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);
+
+        if (!populateImageView(imgView, itemList.get(i))) {
+            imgView.setImageResource(defaultImageRes);
+        }
+        if (!populateTextView(txtView, itemList.get(i))) {
+            txtView.setText(itemList.get(i).toString());
+        }
+        if (!populateOverlayView(overlayView, itemList.get(i))) {
+            overlayView.setVisibility(View.INVISIBLE);
+        }
+        else {
+            overlayView.setVisibility(View.VISIBLE);
+        }
+
+        return convertView;
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.limelight.grid;
+
+import android.content.Context;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.limelight.PcView;
+import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+
+public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
+
+    public PcGridAdapter(Context context) {
+        super(context, R.layout.pc_grid_item, R.drawable.computer);
+    }
+
+    public void addComputer(PcView.ComputerObject computer) {
+        itemList.add(computer);
+    }
+
+    public boolean removeComputer(PcView.ComputerObject computer) {
+        return itemList.remove(computer);
+    }
+
+    @Override
+    public boolean populateImageView(ImageView imgView, PcView.ComputerObject obj) {
+        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+            imgView.setAlpha(1.0f);
+        }
+        else {
+            imgView.setAlpha(0.4f);
+        }
+
+        // Return false to use the default drawable
+        return false;
+    }
+
+    @Override
+    public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
+        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+            txtView.setAlpha(1.0f);
+        }
+        else {
+            txtView.setAlpha(0.4f);
+        }
+
+        // Return false to use the computer's toString method
+        return false;
+    }
+
+    @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);
+            return true;
+        }
+
+        // No overlay
+        return false;
+    }
+}

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

@@ -1,11 +1,14 @@
-package com.limelight;
+package com.limelight.preferences;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import com.limelight.computers.ComputerManagerService;
+import com.limelight.R;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.SpinnerDialog;
+import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
 import android.app.Service;
@@ -14,14 +17,12 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.view.View;
+import android.view.KeyEvent;
-import android.view.View.OnClickListener;
+import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
 public class AddComputerManually extends Activity {
-	private Button addPcButton;
 	private TextView hostText;
 	private ComputerManagerService.ComputerManagerBinder managerBinder;
 	private LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
@@ -41,21 +42,27 @@ public class AddComputerManually extends Activity {
 	private void doAddPc(String host) {
 		String msg;
 		boolean finish = false;
+
+        SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
+			getResources().getString(R.string.msg_add_pc), false);
+
 		try {
 			InetAddress addr = InetAddress.getByName(host);
 			
 			if (!managerBinder.addComputerBlocking(addr)){
-				msg = "Unable to connect to the specified computer. Make sure the required ports are allowed through the firewall.";
+				msg = getResources().getString(R.string.addpc_fail);
 			}
 			else {
-				msg = "Successfully added computer";
+				msg = getResources().getString(R.string.addpc_success);
 				finish = true;
 			}
 		} catch (UnknownHostException e) {
-			msg = "Unable to resolve PC address. Make sure you didn't make a typo in the address.";
+			msg = getResources().getString(R.string.addpc_unknown_host);
 		}
-		
+
-		final boolean toastFinish = finish;
+        dialog.dismiss();
+
+        final boolean toastFinish = finish;
 		final String toastMsg = msg;
 		AddComputerManually.this.runOnUiThread(new Runnable() {
 			@Override
@@ -97,7 +104,7 @@ public class AddComputerManually extends Activity {
 			
 			try {
 				addThread.join();
-			} catch (InterruptedException e) {}
+			} catch (InterruptedException ignored) {}
 			
 			addThread = null;
 		}
@@ -108,6 +115,7 @@ public class AddComputerManually extends Activity {
 		super.onStop();
 		
 		Dialog.closeDialogs();
+        SpinnerDialog.closeDialogs(this);
 	}
 	
 	@Override
@@ -125,25 +133,32 @@ public class AddComputerManually extends Activity {
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.activity_add_computer_manually);
-		
+
-		this.addPcButton = (Button) findViewById(R.id.addPc);
+        UiHelper.notifyNewRootView(this);
+
 		this.hostText = (TextView) findViewById(R.id.hostTextView);
+        hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+                if (actionId == EditorInfo.IME_ACTION_DONE ||
+                        (keyEvent != null &&
+                                keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
+                                keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (hostText.getText().length() == 0) {
+                        Toast.makeText(AddComputerManually.this, getResources().getString(R.string.addpc_enter_ip), Toast.LENGTH_LONG).show();
+                        return true;
+                    }
+
+                    computersToAdd.add(hostText.getText().toString());
+                }
+
+                return false;
+            }
+        });
 		
 		// Bind to the ComputerManager service
 		bindService(new Intent(AddComputerManually.this,
-				ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
+					ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
-	
-		addPcButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (hostText.getText().length() == 0) {
-					Toast.makeText(AddComputerManually.this, "You must enter an IP address", Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				Toast.makeText(AddComputerManually.this, "Adding PC...", Toast.LENGTH_SHORT).show();
-				computersToAdd.add(hostText.getText().toString());
-			}
-		});
 	}
 }

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

@@ -0,0 +1,146 @@
+package com.limelight.preferences;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class PreferenceConfiguration {
+    static final String RES_FPS_PREF_STRING = "list_resolution_fps";
+    private static final String DECODER_PREF_STRING = "list_decoders";
+    static final String BITRATE_PREF_STRING = "seekbar_bitrate";
+    private static final String STRETCH_PREF_STRING = "checkbox_stretch_video";
+    private static final String SOPS_PREF_STRING = "checkbox_enable_sops";
+    private static final String DISABLE_TOASTS_PREF_STRING = "checkbox_disable_warnings";
+    private static final String HOST_AUDIO_PREF_STRING = "checkbox_host_audio";
+    private static final String DEADZONE_PREF_STRING = "seekbar_deadzone";
+
+    private static final int BITRATE_DEFAULT_720_30 = 5;
+    private static final int BITRATE_DEFAULT_720_60 = 10;
+    private static final int BITRATE_DEFAULT_1080_30 = 10;
+    private static final int BITRATE_DEFAULT_1080_60 = 20;
+
+    private static final String DEFAULT_RES_FPS = "720p60";
+    private static final String DEFAULT_DECODER = "auto";
+    private static final int DEFAULT_BITRATE = BITRATE_DEFAULT_720_60;
+    private static final boolean DEFAULT_STRETCH = false;
+    private static final boolean DEFAULT_SOPS = true;
+    private static final boolean DEFAULT_DISABLE_TOASTS = false;
+    private static final boolean DEFAULT_HOST_AUDIO = false;
+    private static final int DEFAULT_DEADZONE = 15;
+
+    public static final int FORCE_HARDWARE_DECODER = -1;
+    public static final int AUTOSELECT_DECODER = 0;
+    public static final int FORCE_SOFTWARE_DECODER = 1;
+
+    public int width, height, fps;
+    public int bitrate;
+    public int decoder;
+    public int deadzonePercentage;
+    public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
+
+    public static int getDefaultBitrate(String resFpsString) {
+        if (resFpsString.equals("720p30")) {
+            return BITRATE_DEFAULT_720_30;
+        }
+        else if (resFpsString.equals("720p60")) {
+            return BITRATE_DEFAULT_720_60;
+        }
+        else if (resFpsString.equals("1080p30")) {
+            return BITRATE_DEFAULT_1080_30;
+        }
+        else if (resFpsString.equals("1080p60")) {
+            return BITRATE_DEFAULT_1080_60;
+        }
+        else {
+            // Should never get here
+            return DEFAULT_BITRATE;
+        }
+    }
+
+    public static int getDefaultBitrate(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
+        if (str.equals("720p30")) {
+            return BITRATE_DEFAULT_720_30;
+        }
+        else if (str.equals("720p60")) {
+            return BITRATE_DEFAULT_720_60;
+        }
+        else if (str.equals("1080p30")) {
+            return BITRATE_DEFAULT_1080_30;
+        }
+        else if (str.equals("1080p60")) {
+            return BITRATE_DEFAULT_1080_60;
+        }
+        else {
+            // Should never get here
+            return DEFAULT_BITRATE;
+        }
+    }
+
+    private static int getDecoderValue(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        String str = prefs.getString(DECODER_PREF_STRING, DEFAULT_DECODER);
+        if (str.equals("auto")) {
+            return AUTOSELECT_DECODER;
+        }
+        else if (str.equals("software")) {
+            return FORCE_SOFTWARE_DECODER;
+        }
+        else if (str.equals("hardware")) {
+            return FORCE_HARDWARE_DECODER;
+        }
+        else {
+            // Should never get here
+            return AUTOSELECT_DECODER;
+        }
+    }
+
+    public static PreferenceConfiguration readPreferences(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        PreferenceConfiguration config = new PreferenceConfiguration();
+
+        config.bitrate = prefs.getInt(BITRATE_PREF_STRING, getDefaultBitrate(context));
+        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
+        if (str.equals("720p30")) {
+            config.width = 1280;
+            config.height = 720;
+            config.fps = 30;
+        }
+        else if (str.equals("720p60")) {
+            config.width = 1280;
+            config.height = 720;
+            config.fps = 60;
+        }
+        else if (str.equals("1080p30")) {
+            config.width = 1920;
+            config.height = 1080;
+            config.fps = 30;
+        }
+        else if (str.equals("1080p60")) {
+            config.width = 1920;
+            config.height = 1080;
+            config.fps = 60;
+        }
+        else {
+            // Should never get here
+            config.width = 1280;
+            config.height = 720;
+            config.fps = 60;
+        }
+
+        config.decoder = getDecoderValue(context);
+
+        config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
+
+        // Checkbox preferences
+        config.disableWarnings = prefs.getBoolean(DISABLE_TOASTS_PREF_STRING, DEFAULT_DISABLE_TOASTS);
+        config.enableSops = prefs.getBoolean(SOPS_PREF_STRING, DEFAULT_SOPS);
+        config.stretchVideo = prefs.getBoolean(STRETCH_PREF_STRING, DEFAULT_STRETCH);
+        config.playHostAudio = prefs.getBoolean(HOST_AUDIO_PREF_STRING, DEFAULT_HOST_AUDIO);
+
+        return config;
+    }
+}

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

@@ -0,0 +1,165 @@
+package com.limelight.preferences;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+// Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
+public class SeekBarPreference extends DialogPreference
+{
+    private static final String SCHEMA_URL = "http://schemas.android.com/apk/res/android";
+
+    private SeekBar seekBar;
+    private TextView valueText;
+    private Context context;
+
+    private String dialogMessage, suffix;
+    private int defaultValue, maxValue, minValue, currentValue;
+
+    public SeekBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+
+        // Read the message from XML
+        int dialogMessageId = attrs.getAttributeResourceValue(SCHEMA_URL, "dialogMessage", 0);
+        if (dialogMessageId == 0) {
+            dialogMessage = attrs.getAttributeValue(SCHEMA_URL, "dialogMessage");
+        }
+        else {
+            dialogMessage = context.getString(dialogMessageId);
+        }
+
+        // Get the suffix for the number displayed in the dialog
+        int suffixId = attrs.getAttributeResourceValue(SCHEMA_URL, "text", 0);
+        if (suffixId == 0) {
+            suffix = attrs.getAttributeValue(SCHEMA_URL, "text");
+        }
+        else {
+            suffix = context.getString(suffixId);
+        }
+
+        // Get default, min, and max seekbar values
+        defaultValue = attrs.getAttributeIntValue(SCHEMA_URL, "defaultValue", PreferenceConfiguration.getDefaultBitrate(context));
+        maxValue = attrs.getAttributeIntValue(SCHEMA_URL, "max", 100);
+        minValue = 1;
+    }
+
+    @Override
+    protected View onCreateDialogView() {
+
+        LinearLayout.LayoutParams params;
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(6, 6, 6, 6);
+
+        TextView splashText = new TextView(context);
+        splashText.setPadding(30, 10, 30, 10);
+        if (dialogMessage != null) {
+            splashText.setText(dialogMessage);
+        }
+        layout.addView(splashText);
+
+        valueText = new TextView(context);
+        valueText.setGravity(Gravity.CENTER_HORIZONTAL);
+        valueText.setTextSize(32);
+        params = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        layout.addView(valueText, params);
+
+        seekBar = new SeekBar(context);
+        seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int value, boolean b) {
+                if (value < minValue) {
+                    seekBar.setProgress(minValue);
+                    return;
+                }
+
+                String t = String.valueOf(value);
+                valueText.setText(suffix == null ? t : t.concat(suffix.length() > 1 ? " "+suffix : suffix));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {}
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {}
+        });
+
+        layout.addView(seekBar, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+
+        if (shouldPersist()) {
+            currentValue = getPersistedInt(defaultValue);
+        }
+
+        seekBar.setMax(maxValue);
+        seekBar.setProgress(currentValue);
+
+        return layout;
+    }
+
+    @Override
+    protected void onBindDialogView(View v) {
+        super.onBindDialogView(v);
+        seekBar.setMax(maxValue);
+        seekBar.setProgress(currentValue);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restore, Object defaultValue)
+    {
+        super.onSetInitialValue(restore, defaultValue);
+        if (restore) {
+            currentValue = shouldPersist() ? getPersistedInt(this.defaultValue) : 0;
+        }
+        else {
+            currentValue = (Integer) defaultValue;
+        }
+    }
+
+    public void setMax(int max) {
+        this.maxValue = max;
+    }
+    public int getMax() {
+        return this.maxValue;
+    }
+
+    public void setProgress(int progress) {
+        this.currentValue = progress;
+        if (seekBar != null) {
+            seekBar.setProgress(progress);
+        }
+    }
+    public int getProgress() {
+        return currentValue;
+    }
+
+    @Override
+    public void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE);
+        positiveButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (shouldPersist()) {
+                    currentValue = seekBar.getProgress();
+                    persistInt(seekBar.getProgress());
+                    callChangeListener(seekBar.getProgress());
+                }
+
+                getDialog().dismiss();
+            }
+        });
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.limelight.preferences;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.app.Activity;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+
+import com.limelight.R;
+import com.limelight.utils.UiHelper;
+
+public class StreamSettings extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_stream_settings);
+        getFragmentManager().beginTransaction().replace(
+                R.id.stream_settings, new SettingsFragment()
+        ).commit();
+
+        UiHelper.notifyNewRootView(this);
+    }
+
+    public static class SettingsFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            addPreferencesFromResource(R.xml.preferences);
+
+            // Add a listener to the FPS and resolution preference
+            // so the bitrate can be auto-adjusted
+            Preference pref = findPreference(PreferenceConfiguration.RES_FPS_PREF_STRING);
+            pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                    String valueStr = (String) newValue;
+
+                    // Write the new bitrate value
+                    prefs.edit()
+                            .putInt(PreferenceConfiguration.BITRATE_PREF_STRING,
+                                    PreferenceConfiguration.getDefaultBitrate(valueStr))
+                            .apply();
+
+                    // Allow the original preference change to take place
+                    return true;
+                }
+            });
+        }
+    }
+}

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

@@ -13,7 +13,7 @@ public class Dialog implements Runnable {
 	
 	private AlertDialog alert;
 	
-	private static ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
+	private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
 	
 	public Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
 	{
@@ -57,7 +57,7 @@ public class Dialog implements Runnable {
     	alert.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", new DialogInterface.OnClickListener() {
     	      public void onClick(DialogInterface dialog, int which) {
     	    	  synchronized (rundownDialogs) {
-        	    	  rundownDialogs.remove(this);
+        	    	  rundownDialogs.remove(Dialog.this);
         	    	  alert.dismiss();
     	    	  }
     	    	  

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

@@ -14,7 +14,7 @@ public class SpinnerDialog implements Runnable,OnCancelListener {
 	private ProgressDialog progress;
 	private boolean finish;
 	
-	private static ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
+	private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
 	
 	public SpinnerDialog(Activity activity, String title, String message, boolean finish)
 	{

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

@@ -0,0 +1,31 @@
+package com.limelight.utils;
+
+import android.app.Activity;
+import android.app.UiModeManager;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.view.View;
+
+public class UiHelper {
+
+    // Values from https://developer.android.com/training/tv/start/layouts.html
+    private static final int TV_VERTICAL_PADDING_DP = 27;
+    private static final int TV_HORIZONTAL_PADDING_DP = 48;
+
+    public static void notifyNewRootView(Activity activity)
+    {
+        View rootView = activity.findViewById(android.R.id.content);
+        UiModeManager modeMgr = (UiModeManager) activity.getSystemService(Context.UI_MODE_SERVICE);
+
+        if (modeMgr.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
+        {
+            // Increase view padding on TVs
+            float scale = activity.getResources().getDisplayMetrics().density;
+            int verticalPaddingPixels = (int) (TV_VERTICAL_PADDING_DP*scale + 0.5f);
+            int horizontalPaddingPixels = (int) (TV_HORIZONTAL_PADDING_DP*scale + 0.5f);
+
+            rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
+                    horizontalPaddingPixels, verticalPaddingPixels);
+        }
+    }
+}

app/src/main/jni/evdev_reader/Android.mk

@@ -0,0 +1,13 @@
+# Android.mk for Limelight's Evdev Reader
+MY_LOCAL_PATH := $(call my-dir)
+
+include $(call all-subdir-makefiles)
+
+LOCAL_PATH := $(MY_LOCAL_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := evdev_reader
+LOCAL_SRC_FILES := evdev_reader.c
+LOCAL_LDLIBS    := -llog
+
+include $(BUILD_SHARED_LIBRARY)

app/src/main/jni/evdev_reader/evdev_reader.c

@@ -0,0 +1,118 @@
+#include <stdlib.h>
+#include <jni.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <linux/input.h>
+#include <unistd.h>
+#include <poll.h>
+#include <errno.h>
+
+#include <android/log.h>
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_open(JNIEnv *env, jobject this, jstring absolutePath) {
+	const char *path;
+	
+	path = (*env)->GetStringUTFChars(env, absolutePath, NULL);
+	
+	return open(path, O_RDWR);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_grab(JNIEnv *env, jobject this, jint fd) {
+    return ioctl(fd, EVIOCGRAB, 1) == 0;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_ungrab(JNIEnv *env, jobject this, jint fd) {
+    return ioctl(fd, EVIOCGRAB, 0) == 0;
+}
+
+// has*() and friends are based on Android's EventHub.cpp
+
+#define test_bit(bit, array)    (array[bit/8] & (1<<(bit%8)))
+
+JNIEXPORT jboolean JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_hasRelAxis(JNIEnv *env, jobject this, jint fd, jshort axis) {
+    unsigned char relBitmask[(REL_MAX + 1) / 8];
+    
+    ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relBitmask)), relBitmask);
+    
+    return test_bit(axis, relBitmask);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_hasAbsAxis(JNIEnv *env, jobject this, jint fd, jshort axis) {
+    unsigned char absBitmask[(ABS_MAX + 1) / 8];
+    
+    ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absBitmask)), absBitmask);
+    
+    return test_bit(axis, absBitmask);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_hasKey(JNIEnv *env, jobject this, jint fd, jshort key) {
+    unsigned char keyBitmask[(KEY_MAX + 1) / 8];
+    
+    ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keyBitmask)), keyBitmask);
+    
+    return test_bit(key, keyBitmask);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_read(JNIEnv *env, jobject this, jint fd, jbyteArray buffer) {
+    jint ret;
+    jbyte *data;
+    int pollres;
+    struct pollfd pollinfo;
+    
+    data = (*env)->GetByteArrayElements(env, buffer, NULL);
+    if (data == NULL) {
+        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
+            "Failed to get byte array");
+        return -1;
+    }
+
+    do
+    {
+        // Unwait every 250 ms to return to caller if the fd is closed
+        pollinfo.fd = fd;
+        pollinfo.events = POLLIN;
+        pollinfo.revents = 0;
+        pollres = poll(&pollinfo, 1, 250);
+    }
+    while (pollres == 0);
+    
+    if (pollres > 0 && (pollinfo.revents & POLLIN)) {
+        // We'll have data available now
+        ret = read(fd, data, sizeof(struct input_event));
+        if (ret < 0) {
+            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
+                "read() failed: %d", errno);
+        }
+    }
+    else {
+        // There must have been a failure
+        ret = -1;
+    
+        if (pollres < 0) {
+            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
+                "poll() failed: %d", errno);
+        }
+        else {
+            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
+                "Unexpected revents: %d", pollinfo.revents);
+        }
+    }
+    
+    (*env)->ReleaseByteArrayElements(env, buffer, data, 0);
+
+	return ret;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_binding_input_evdev_EvdevReader_close(JNIEnv *env, jobject this, jint fd) {
+	return close(fd);
+}