Submit codec config frames with the corresponding flag to work around an TI OMAP 4 errata. Also add a file that documents the currently known codec errata.

2014-07-02 23:42:54 -07:00
393 changed files with 48865 additions and 13262 deletions
@@ -0,0 +1,9 @@
+<?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>
@@ -1,35 +1 @@
-#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
+/bin/*
@@ -0,0 +1,2 @@
+*** SESSION Sep 21, 2013 18:55:11.17 -------------------------------------------
+*** SESSION Sep 21, 2013 18:55:55.08 -------------------------------------------
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1,3 @@
+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
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+spelling_locale_initialized=true
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+version=1
@@ -0,0 +1,13 @@
+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
@@ -0,0 +1,5 @@
+PROBLEMS_FILTERS_MIGRATE=true
+eclipse.preferences.version=1
+platformState=1379804095671
+quickStart=false
+tipsAndTricks=true
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+showIntro=false
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<typeInfoHistroy/>
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<qualifiedTypeNameHistroy/>
@@ -0,0 +1,12 @@
+<?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>
@@ -0,0 +1,15 @@
+<?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>
@@ -0,0 +1,17 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1 @@
+org.eclipse.core.runtime=1
@@ -0,0 +1,33 @@
+<?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>
@@ -0,0 +1,11 @@
+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
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.limelight"
+    android:versionCode="18"
+    android:versionName="2.4" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="19" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.limelight.Connection"
+            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>
+        <activity
+            android:name="com.limelight.Game"
+            android:screenOrientation="sensorLandscape"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:label="@string/title_activity_game"
+            android:parentActivityName="com.limelight.Connection"
+            android:theme="@style/FullscreenTheme" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.limelight.Connection" />
+        </activity>
+    </application>
+
+</manifest>
@@ -1,41 +1,45 @@
-#Moonlight
+#Limelight

-[Moonlight](http://moonlight-stream.com) 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.
+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.

-Moonlight will allow you to stream your full collection of games from your Windows PC to your Android device,
-whether in your own home or over the internet.
+Limelight will allow you to stream your full collection of Steam games from your Windows PC to your Android device,
+in your own home, or over the internet.

-[Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/moonlight-stream/moonlight-ios) and [Windows and Windows Phone](https://github.com/moonlight-stream/moonlight-windows) are also in development.
-
-Check our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki) for more detailed information or a troubleshooting guide. 
+[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.

 ##Features

-* Streams any of your games from your PC to your Android device
+* Streams Steam and all of your games from your PC to your Android device
 * Full gamepad support for MOGA, Xbox 360, PS3, OUYA, and Shield
-* Automatically finds GameStream-compatible PCs on your network
+
+##Features in development
+
+* Use mDNS to scan for compatible GeForce Experience (GFE) machines on the network
+* Choose from the list of available games instead of just launching Steam
+* Keyboard input

 ##Installation

-* Download and install Moonlight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight), [Amazon App Store](http://www.amazon.com/gp/product/B00JK4MFN2), or directly from the [releases page](https://github.com/moonlight-stream/moonlight-android/releases)
+* Download and install Limelight for Android from
+[XDA](http://forum.xda-developers.com/showthread.php?t=2505510)
 * Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC

 ##Requirements

-* [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with GTX 600/700 series GPU
+* [GFE 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

-* Turn on GameStream in the GFE settings
+* Turn on Shield Streaming in the GFE settings
 * If you are connecting from outside the same network, turn on internet
  streaming
-* When on the same network as your PC, open Moonlight and tap on your PC in the list
+* In Limelight, enter your PC's IP or Hostname and click "Pair"
 * Accept the pairing confirmation on your PC
-* Tap your PC again to view the list of apps to stream
+* In Limelight, click "Start Streaming"
 * Play games!

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

+Check out our [website](http://limelight-stream.com) for project links and information.
+
 ##Authors

 * [Cameron Gutman](https://github.com/cgutman)  
@@ -53,5 +59,5 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 * [Aaron Neyer](https://github.com/Aaronneyer)  
 * [Andrew Hennessy](https://github.com/yetanothername)

-Moonlight is the work of students at [Case Western](http://case.edu) and was
+Limelight is the work of students at [Case Western](http://case.edu) and was
 started as a project at [MHacks](http://mhacks.org).
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="moonlight-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="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNonRootDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateNonRootDebugAndroidTestSources</task>
-          <task>generateNonRootDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <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" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/nonRoot/debug" />
-    <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$/build/generated/res/resValues/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/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/nonRoot/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/nonRoot/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/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 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.52" level="project" />
-    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.52" level="project" />
-    <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
-    <orderEntry type="library" exported="" name="limelight-common" level="project" />
-    <orderEntry type="library" exported="" name="jmdns-3.4.2" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="jcodec-0.1.9-patched" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.5.0" level="project" />
-  </component>
-</module>
@@ -1,75 +0,0 @@
-import com.android.builder.model.ProductFlavor
-import org.apache.tools.ant.taskdefs.condition.Os
-
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 23
-
-        versionName "4.0.4"
-        versionCode = 82
-    }
-
-    productFlavors {
-        root {
-            applicationId "com.limelight.root"
-        }
-
-        nonRoot {
-            applicationId "com.limelight"
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled 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.bouncycastle', name: 'bcprov-jdk15on', version: '1.52'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.52'
-
-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.4.0'
-    compile group: 'com.squareup.okio', name:'okio', version:'1.5.0'
-
-    compile files('libs/jmdns-3.4.2.jar')
-    compile files('libs/limelight-common.jar')
-    compile files('libs/tinyrtsp.jar')
-    compile files('libs/jcodec-0.1.9-patched.jar')
-}
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.limelight">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.hardware.wifi" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false" />
-    <uses-feature android:name="android.hardware.usb.host" android:required="false" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme" >
-
-        <!-- Samsung multi-window support -->
-        <uses-library android:name="com.sec.android.app.multiwindow" android:required="false" />
-        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-        
-        <!-- Launcher for traditional devices -->
-        <activity
-            android:name=".PcView"
-            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.LAUNCHER" />
-                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
-                <category android:name="tv.ouya.intent.category.APP" />
-            </intent-filter>
-        </activity>
-        
-        <!-- Launcher for Android TV devices -->
-        <activity
-            android:name=".PcViewTv"
-            android:logo="@drawable/atv_banner"
-            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=".preferences.StreamSettings"
-            android:label="Streaming Settings" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.PcView" />
-        </activity>
-        <activity
-            android:name=".preferences.AddComputerManually"
-            android:label="Add Computer Manually" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.PcView" />
-        </activity>
-        <activity
-            android:name=".Game"
-            android:screenOrientation="sensorLandscape"
-            android:theme="@style/StreamTheme"
-            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.AppView" />
-        </activity>
-
-        <service
-            android:name=".discovery.DiscoveryService"
-            android:label="mDNS PC Auto-Discovery Service" />
-        <service
-            android:name=".computers.ComputerManagerService"
-            android:label="Computer Management Service" />
-        <service
-            android:name=".binding.input.driver.UsbDriverService"
-            android:label="Usb Driver Service" />
-    </application>
-
-</manifest>
@@ -1,502 +0,0 @@
-package com.limelight;
-
-import java.io.StringReader;
-import java.util.List;
-import java.util.Locale;
-import java.util.UUID;
-
-import com.limelight.computers.ComputerManagerListener;
-import com.limelight.computers.ComputerManagerService;
-import com.limelight.grid.AppGridAdapter;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvApp;
-import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.preferences.PreferenceConfiguration;
-import com.limelight.ui.AdapterFragment;
-import com.limelight.ui.AdapterFragmentCallbacks;
-import com.limelight.utils.CacheHelper;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.ServerHelper;
-import com.limelight.utils.SpinnerDialog;
-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.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-
-public class AppView extends Activity implements AdapterFragmentCallbacks {
-    private AppGridAdapter appGridAdapter;
-    private String uuidString;
-
-    private ComputerDetails computer;
-    private ComputerManagerService.ApplistPoller poller;
-    private SpinnerDialog blockingLoadSpinner;
-    private String lastRawApplist;
-    private int lastRunningAppId;
-    private boolean suspendGridUpdates;
-
-    private final static int START_OR_RESUME_ID = 1;
-    private final static int QUIT_ID = 2;
-    private final static int CANCEL_ID = 3;
-    private final static int START_WTIH_QUIT = 4;
-
-    public final static String NAME_EXTRA = "Name";
-    public final static String UUID_EXTRA = "UUID";
-
-    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private final ServiceConnection serviceConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder binder) {
-            final ComputerManagerService.ComputerManagerBinder localBinder =
-                    ((ComputerManagerService.ComputerManagerBinder)binder);
-
-            // Wait in a separate thread to avoid stalling the UI
-            new Thread() {
-                @Override
-                public void run() {
-                    // Wait for the binder to be ready
-                    localBinder.waitForReady();
-
-                    // Now make the binder visible
-                    managerBinder = localBinder;
-
-                    // Get the computer object
-                    computer = managerBinder.getComputer(UUID.fromString(uuidString));
-
-                    try {
-                        appGridAdapter = new AppGridAdapter(AppView.this,
-                                PreferenceConfiguration.readPreferences(AppView.this).listMode,
-                                PreferenceConfiguration.readPreferences(AppView.this).smallIconMode,
-                                computer, managerBinder.getUniqueId());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        finish();
-                        return;
-                    }
-
-                    // Start updates
-                    startComputerUpdates();
-
-                    // Load the app grid with cached data (if possible)
-                    populateAppGridWithCache();
-
-                    getFragmentManager().beginTransaction()
-                            .replace(R.id.appFragmentContainer, new AdapterFragment())
-                            .commitAllowingStateLoss();
-                }
-            }.start();
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            managerBinder = null;
-        }
-    };
-
-    private void startComputerUpdates() {
-        if (managerBinder == null) {
-            return;
-        }
-
-        managerBinder.startPolling(new ComputerManagerListener() {
-            @Override
-            public void notifyComputerUpdated(ComputerDetails details) {
-                // Do nothing if updates are suspended
-                if (suspendGridUpdates) {
-                    return;
-                }
-
-                // Don't care about other computers
-                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
-                    return;
-                }
-
-                if (details.state == ComputerDetails.State.OFFLINE) {
-                    // The PC is unreachable now
-                    AppView.this.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            // Display a toast to the user and quit the activity
-                            Toast.makeText(AppView.this, getResources().getText(R.string.lost_connection), Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
-                    });
-
-                    return;
-                }
-
-                // App list is the same or empty
-                if (details.rawAppList == null || details.rawAppList.equals(lastRawApplist)) {
-
-                    // Let's check if the running app ID changed
-                    if (details.runningGameId != lastRunningAppId) {
-                        // Update the currently running game using the app ID
-                        lastRunningAppId = details.runningGameId;
-                        updateUiWithServerinfo(details);
-                    }
-
-                    return;
-                }
-
-                lastRunningAppId = details.runningGameId;
-                lastRawApplist = details.rawAppList;
-
-                try {
-                    updateUiWithAppList(NvHTTP.getAppListByReader(new StringReader(details.rawAppList)));
-
-                    if (blockingLoadSpinner != null) {
-                        blockingLoadSpinner.dismiss();
-                        blockingLoadSpinner = null;
-                    }
-                } catch (Exception ignored) {}
-            }
-        });
-
-        if (poller == null) {
-            poller = managerBinder.createAppListPoller(computer);
-        }
-        poller.start();
-    }
-
-    private void stopComputerUpdates() {
-        if (poller != null) {
-            poller.stop();
-        }
-
-        if (managerBinder != null) {
-            managerBinder.stopPolling();
-        }
-
-        if (appGridAdapter != null) {
-            appGridAdapter.cancelQueuedOperations();
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
-
-        setContentView(R.layout.activity_app_view);
-
-        UiHelper.notifyNewRootView(this);
-
-        uuidString = getIntent().getStringExtra(UUID_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);
-
-        // Bind to the computer manager service
-        bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
-                Service.BIND_AUTO_CREATE);
-    }
-
-    private void populateAppGridWithCache() {
-        try {
-            // Try to load from cache
-            lastRawApplist = CacheHelper.readInputStreamToString(CacheHelper.openCacheFileForInput(getCacheDir(), "applist", uuidString));
-            List<NvApp> applist = NvHTTP.getAppListByReader(new StringReader(lastRawApplist));
-            updateUiWithAppList(applist);
-            LimeLog.info("Loaded applist from cache");
-        } catch (Exception e) {
-            if (lastRawApplist != null) {
-                LimeLog.warning("Saved applist corrupted: "+lastRawApplist);
-                e.printStackTrace();
-            }
-            LimeLog.info("Loading applist from the network");
-            // We'll need to load from the network
-            loadAppsBlocking();
-        }
-    }
-
-    private void loadAppsBlocking() {
-        blockingLoadSpinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.applist_refresh_title),
-                getResources().getString(R.string.applist_refresh_msg), true);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        SpinnerDialog.closeDialogs(this);
-        Dialog.closeDialogs();
-
-        if (managerBinder != null) {
-            unbindService(serviceConnection);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        startComputerUpdates();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        stopComputerUpdates();
-    }
-
-    private int getRunningAppId() {
-        int runningAppId = -1;
-        for (int i = 0; i < appGridAdapter.getCount(); i++) {
-            AppObject app = (AppObject) appGridAdapter.getItem(i);
-            if (app.app.getIsRunning()) {
-                runningAppId = app.app.getAppId();
-                break;
-            }
-        }
-        return runningAppId;
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
-        int runningAppId = getRunningAppId();
-        if (runningAppId != -1) {
-            if (runningAppId == selectedApp.app.getAppId()) {
-                menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
-                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
-            }
-            else {
-                menu.add(Menu.NONE, START_WTIH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
-                menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
-            }
-        }
-    }
-
-    @Override
-    public void onContextMenuClosed(Menu menu) {
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        final AppObject app = (AppObject) appGridAdapter.getItem(info.position);
-        switch (item.getItemId()) {
-            case START_WTIH_QUIT:
-                // Display a confirmation dialog first
-                UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
-                    @Override
-                    public void run() {
-                        ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
-                    }
-                }, null);
-                return true;
-
-            case START_OR_RESUME_ID:
-                // Resume is the same as start for us
-                ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
-                return true;
-
-            case QUIT_ID:
-                // Display a confirmation dialog first
-                UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
-                    @Override
-                    public void run() {
-                        suspendGridUpdates = true;
-                        ServerHelper.doQuit(AppView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer),
-                                app.app, managerBinder, new Runnable() {
-                            @Override
-                            public void run() {
-                                // Trigger a poll immediately
-                                suspendGridUpdates = false;
-                                if (poller != null) {
-                                    poller.pollNow();
-                                }
-                            }
-                        });
-                    }
-                }, null);
-                return true;
-
-            case CANCEL_ID:
-                return true;
-
-            default:
-                return super.onContextItemSelected(item);
-        }
-    }
-
-    private void updateUiWithServerinfo(final ComputerDetails details) {
-        AppView.this.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                boolean updated = false;
-
-                    // Look through our current app list to tag the running app
-                for (int i = 0; i < appGridAdapter.getCount(); i++) {
-                    AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
-
-                    // There can only be one or zero apps running.
-                    if (existingApp.app.getIsRunning() &&
-                            existingApp.app.getAppId() == details.runningGameId) {
-                        // This app was running and still is, so we're done now
-                        return;
-                    }
-                    else if (existingApp.app.getAppId() == details.runningGameId) {
-                        // This app wasn't running but now is
-                        existingApp.app.setIsRunning(true);
-                        updated = true;
-                    }
-                    else if (existingApp.app.getIsRunning()) {
-                        // This app was running but now isn't
-                        existingApp.app.setIsRunning(false);
-                        updated = true;
-                    }
-                    else {
-                        // This app wasn't running and still isn't
-                    }
-                }
-
-                if (updated) {
-                    appGridAdapter.notifyDataSetChanged();
-                }
-            }
-        });
-    }
-
-    private void updateUiWithAppList(final List<NvApp> appList) {
-        AppView.this.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                boolean updated = false;
-
-                // First handle app updates and additions
-                for (NvApp app : appList) {
-                    boolean foundExistingApp = false;
-
-                    // Try to update an existing app in the list first
-                    for (int i = 0; i < appGridAdapter.getCount(); i++) {
-                        AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
-                        if (existingApp.app.getAppId() == app.getAppId()) {
-                            // Found the app; update its properties
-                            if (existingApp.app.getIsRunning() != app.getIsRunning()) {
-                                existingApp.app.setIsRunning(app.getIsRunning());
-                                updated = true;
-                            }
-                            if (!existingApp.app.getAppName().equals(app.getAppName())) {
-                                existingApp.app.setAppName(app.getAppName());
-                                updated = true;
-                            }
-
-                            foundExistingApp = true;
-                            break;
-                        }
-                    }
-
-                    if (!foundExistingApp) {
-                        // This app must be new
-                        appGridAdapter.addApp(new AppObject(app));
-                        updated = true;
-                    }
-                }
-
-                // Next handle app removals
-                int i = 0;
-                while (i < appGridAdapter.getCount()) {
-                    boolean foundExistingApp = false;
-                    AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
-
-                    // Check if this app is in the latest list
-                    for (NvApp app : appList) {
-                        if (existingApp.app.getAppId() == app.getAppId()) {
-                            foundExistingApp = true;
-                            break;
-                        }
-                    }
-
-                    // This app was removed in the latest app list
-                    if (!foundExistingApp) {
-                        appGridAdapter.removeApp(existingApp);
-                        updated = true;
-
-                        // Check this same index again because the item at i+1 is now at i after
-                        // the removal
-                        continue;
-                    }
-
-                    // Move on to the next item
-                    i++;
-                }
-
-                if (updated) {
-                    appGridAdapter.notifyDataSetChanged();
-                }
-            }
-        });
-    }
-
-    @Override
-    public int getAdapterFragmentLayoutId() {
-        return PreferenceConfiguration.readPreferences(this).listMode ?
-                R.layout.list_view : (PreferenceConfiguration.readPreferences(AppView.this).smallIconMode ?
-                    R.layout.app_grid_view_small : R.layout.app_grid_view);
-    }
-
-    @Override
-    public void receiveAbsListView(AbsListView listView) {
-        listView.setAdapter(appGridAdapter);
-        listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            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 (getRunningAppId() != -1) {
-                    openContextMenu(arg1);
-                } else {
-                    ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
-                }
-            }
-        });
-        registerForContextMenu(listView);
-        listView.requestFocus();
-    }
-
-    public class AppObject {
-        public final NvApp app;
-
-        public AppObject(NvApp app) {
-            if (app == null) {
-                throw new IllegalArgumentException("app must not be null");
-            }
-            this.app = app;
-        }
-
-        @Override
-        public String toString() {
-            return app.getAppName();
-        }
-    }
-}
@@ -1,992 +0,0 @@
-package com.limelight;
-
-
-import com.limelight.binding.PlatformBinding;
-import com.limelight.binding.input.ControllerHandler;
-import com.limelight.binding.input.KeyboardTranslator;
-import com.limelight.binding.input.TouchContext;
-import com.limelight.binding.input.driver.UsbDriverService;
-import com.limelight.binding.input.evdev.EvdevHandler;
-import com.limelight.binding.input.evdev.EvdevListener;
-import com.limelight.binding.input.virtual_controller.VirtualController;
-import com.limelight.binding.video.EnhancedDecoderRenderer;
-import com.limelight.binding.video.MediaCodecDecoderRenderer;
-import com.limelight.binding.video.MediaCodecHelper;
-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.http.NvApp;
-import com.limelight.nvstream.input.KeyboardPacket;
-import com.limelight.nvstream.input.MouseButtonPacket;
-import com.limelight.preferences.PreferenceConfiguration;
-import com.limelight.ui.GameGestures;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.SpinnerDialog;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.res.Configuration;
-import android.graphics.Point;
-import android.hardware.input.InputManager;
-import android.media.AudioManager;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.SystemClock;
-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.FrameLayout;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Toast;
-
-import java.util.Locale;
-
-
-public class Game extends Activity implements SurfaceHolder.Callback,
-    OnGenericMotionListener, OnTouchListener, NvConnectionListener, EvdevListener,
-    OnSystemUiVisibilityChangeListener, GameGestures
-{
-    private int lastMouseX = Integer.MIN_VALUE;
-    private int lastMouseY = Integer.MIN_VALUE;
-    private int lastButtonState = 0;
-
-    // Only 2 touches are supported
-    private final TouchContext[] touchContextMap = new TouchContext[2];
-    private long threeFingerDownTime = 0;
-
-    private static final double REFERENCE_HORIZ_RES = 1280;
-    private static final double REFERENCE_VERT_RES = 720;
-
-    private static final int THREE_FINGER_TAP_THRESHOLD = 300;
-
-    private ControllerHandler controllerHandler;
-    private VirtualController virtualController;
-    private KeyboardTranslator keybTranslator;
-
-    private PreferenceConfiguration prefConfig;
-    private final Point screenSize = new Point(0, 0);
-
-    private NvConnection conn;
-    private SpinnerDialog spinner;
-    private boolean displayedFailureDialog = false;
-    private boolean connecting = false;
-    private boolean connected = false;
-    private boolean deferredSurfaceResize = false;
-
-    private EvdevHandler evdevHandler;
-    private int modifierFlags = 0;
-    private boolean grabbedInput = true;
-    private boolean grabComboDown = false;
-
-    private EnhancedDecoderRenderer decoderRenderer;
-
-    private WifiManager.WifiLock wifiLock;
-
-    private int drFlags = 0;
-
-    private boolean connectedToUsbDriverService = false;
-    private ServiceConnection usbDriverServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            UsbDriverService.UsbDriverBinder binder = (UsbDriverService.UsbDriverBinder) iBinder;
-            binder.setListener(controllerHandler);
-            connectedToUsbDriverService = true;
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName componentName) {
-            connectedToUsbDriverService = false;
-        }
-    };
-
-    public static final String EXTRA_HOST = "Host";
-    public static final String EXTRA_APP_NAME = "AppName";
-    public static final String EXTRA_APP_ID = "AppId";
-    public static final String EXTRA_UNIQUEID = "UniqueId";
-    public static final String EXTRA_STREAMING_REMOTE = "Remote";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
-
-        // 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);
-
-        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 appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME);
-        int appId = Game.this.getIntent().getIntExtra(EXTRA_APP_ID, StreamConfiguration.INVALID_APP_ID);
-        String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
-        boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
-
-        if (appId == StreamConfiguration.INVALID_APP_ID) {
-            finish();
-            return;
-        }
-
-        // Initialize the MediaCodec helper before creating the decoder
-        MediaCodecHelper.initializeWithContext(this);
-
-        decoderRenderer = new MediaCodecDecoderRenderer(prefConfig.videoFormat);
-
-        // Display a message to the user if H.265 was forced on but we still didn't find a decoder
-        if (prefConfig.videoFormat == PreferenceConfiguration.FORCE_H265_ON && !decoderRenderer.isHevcSupported()) {
-            Toast.makeText(this, "No H.265 decoder found.\nFalling back to H.264.", Toast.LENGTH_LONG).show();
-        }
-
-        if (!decoderRenderer.isAvcSupported()) {
-            if (spinner != null) {
-                spinner.dismiss();
-                spinner = null;
-            }
-
-            // If we can't find an AVC decoder, we can't proceed
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title),
-                    "This device or ROM doesn't support hardware accelerated H.264 playback.", true);
-            return;
-        }
-        
-        StreamConfiguration config = new StreamConfiguration.Builder()
-                .setResolution(prefConfig.width, prefConfig.height)
-                .setRefreshRate(prefConfig.fps)
-                .setApp(new NvApp(appName, appId))
-                .setBitrate(prefConfig.bitrate * 1000)
-                .setEnableSops(prefConfig.enableSops)
-                .enableAdaptiveResolution((decoderRenderer.getCapabilities() &
-                        VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION) != 0)
-                .enableLocalAudioPlayback(prefConfig.playHostAudio)
-                .setMaxPacketSize(remote ? 1024 : 1292)
-                .setRemote(remote)
-                .setHevcSupported(decoderRenderer.isHevcSupported())
-                .setAudioConfiguration(prefConfig.enable51Surround ?
-                        StreamConfiguration.AUDIO_CONFIGURATION_5_1 :
-                        StreamConfiguration.AUDIO_CONFIGURATION_STEREO)
-                .build();
-
-        // Initialize the connection
-        conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
-        keybTranslator = new KeyboardTranslator(conn);
-        controllerHandler = new ControllerHandler(conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
-
-        InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
-        inputManager.registerInputDeviceListener(controllerHandler, null);
-
-        boolean aspectRatioMatch = false;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-            // On KitKat and later (where we can use the whole screen via immersive mode), we'll
-            // calculate whether we need to scale by aspect ratio or not. If not, we'll use
-            // setFixedSize so we can handle 4K properly. The only known devices that have
-            // >= 4K screens have exactly 4K screens, so we'll be able to hit this good path
-            // on these devices. On Marshmallow, we can start changing to 4K manually but no
-            // 4K devices run 6.0 at the moment.
-            double screenAspectRatio = ((double)screenSize.y) / screenSize.x;
-            double streamAspectRatio = ((double)prefConfig.height) / prefConfig.width;
-            if (Math.abs(screenAspectRatio - streamAspectRatio) < 0.001) {
-                LimeLog.info("Stream has compatible aspect ratio with output display");
-                aspectRatioMatch = true;
-            }
-        }
-
-        SurfaceHolder sh = sv.getHolder();
-        if (prefConfig.stretchVideo || aspectRatioMatch) {
-            // Set the surface to the size of the video
-            sh.setFixedSize(prefConfig.width, prefConfig.height);
-        }
-        else {
-            deferredSurfaceResize = true;
-        }
-
-        // Initialize touch contexts
-        for (int i = 0; i < touchContextMap.length; i++) {
-            touchContextMap[i] = new TouchContext(conn, i,
-                    (REFERENCE_HORIZ_RES / (double)screenSize.x),
-                    (REFERENCE_VERT_RES / (double)screenSize.y));
-        }
-
-        if (LimelightBuildProps.ROOT_BUILD) {
-            // Start watching for raw input
-            evdevHandler = new EvdevHandler(this, this);
-            evdevHandler.start();
-        }
-
-        if (prefConfig.onscreenController) {
-            // create virtual onscreen controller
-            virtualController = new VirtualController(conn,
-                    (FrameLayout)findViewById(R.id.surfaceView).getParent(),
-                    this);
-            virtualController.refreshLayout();
-        }
-
-        if (prefConfig.usbDriver) {
-            // Start the USB driver
-            bindService(new Intent(this, UsbDriverService.class),
-                    usbDriverServiceConnection, Service.BIND_AUTO_CREATE);
-        }
-
-        // 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);
-
-        // refresh virtual controller layout
-        if (virtualController != null) {
-            virtualController.refreshLayout();
-        }
-    }
-
-    private void checkDataConnection()
-    {
-        ConnectivityManager mgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (mgr.isActiveNetworkMetered()) {
-            displayTransientMessage(getResources().getString(R.string.conn_metered));
-        }
-    }
-
-    @SuppressLint("InlinedApi")
-    private final 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();
-
-        if (controllerHandler != null) {
-            InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
-            inputManager.unregisterInputDeviceListener(controllerHandler);
-        }
-
-        wifiLock.release();
-
-        if (connectedToUsbDriverService) {
-            // Unbind from the discovery service
-            unbindService(usbDriverServiceConnection);
-        }
-
-        if (conn != null) {
-            VideoDecoderRenderer.VideoFormat videoFormat = conn.getActiveVideoFormat();
-
-            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";
-            }
-
-            // Add the video codec to the post-stream toast
-            if (message != null && videoFormat != VideoDecoderRenderer.VideoFormat.Unknown) {
-                if (videoFormat == VideoDecoderRenderer.VideoFormat.H265) {
-                    message += " [H.265]";
-                }
-                else {
-                    message += " [H.264]";
-                }
-            }
-
-            if (message != null) {
-                Toast.makeText(this, message, Toast.LENGTH_LONG).show();
-            }
-        }
-
-        finish();
-    }
-
-    private final Runnable toggleGrab = new Runnable() {
-        @Override
-        public void run() {
-            if (evdevHandler != null) {
-                if (grabbedInput) {
-                    evdevHandler.ungrabAll();
-                }
-                else {
-                    evdevHandler.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;
-        }
-    }
-
-    @Override
-    public void showKeyboard() {
-        LimeLog.info("Showing keyboard overlay");
-        InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
-    }
-
-    // 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 mice
-            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();
-            }
-            // This case is for touch-based input devices
-            else
-            {
-                int actionIndex = event.getActionIndex();
-
-                int eventX = (int)event.getX(actionIndex);
-                int eventY = (int)event.getY(actionIndex);
-
-                // Special handling for 3 finger gesture
-                if (event.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN &&
-                        event.getPointerCount() == 3) {
-                    // Three fingers down
-                    threeFingerDownTime = SystemClock.uptimeMillis();
-
-                    // Cancel the first and second touches to avoid
-                    // erroneous events
-                    for (TouchContext aTouchContext : touchContextMap) {
-                        aTouchContext.cancelTouch();
-                    }
-
-                    return true;
-                }
-
-                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:
-                    if (event.getPointerCount() == 1) {
-                        // All fingers up
-                        if (SystemClock.uptimeMillis() - threeFingerDownTime < THREE_FINGER_TAP_THRESHOLD) {
-                            // This is a 3 finger tap to bring up the keyboard
-                            showKeyboard();
-                            return true;
-                        }
-                    }
-                    context.touchUpEvent(eventX, eventY);
-                    if (actionIndex == 0 && event.getPointerCount() > 1 && !context.isCancelled()) {
-                        // 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;
-                }
-            }
-
-            // 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 * (REFERENCE_HORIZ_RES / (double)screenSize.x));
-            deltaY = (int)Math.round((double)deltaY * (REFERENCE_VERT_RES / (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 reader to allow use of captured input devices
-        if (evdevHandler != null) {
-            evdevHandler.stop();
-            evdevHandler = 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 (deferredSurfaceResize) {
-                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);
-        }
-    }
-}
@@ -1,650 +0,0 @@
-package com.limelight;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Locale;
-
-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.NvApp;
-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.PreferenceConfiguration;
-import com.limelight.preferences.StreamSettings;
-import com.limelight.ui.AdapterFragment;
-import com.limelight.ui.AdapterFragmentCallbacks;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.ServerHelper;
-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;
-import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnClickListener;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ImageButton;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-
-public class PcView extends Activity implements AdapterFragmentCallbacks {
-    private RelativeLayout noPcFoundLayout;
-    private PcGridAdapter pcGridAdapter;
-    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private boolean freezeUpdates, runningPolling, hasResumed;
-    private final ServiceConnection serviceConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder binder) {
-            final ComputerManagerService.ComputerManagerBinder localBinder =
-                    ((ComputerManagerService.ComputerManagerBinder)binder);
-
-            // Wait in a separate thread to avoid stalling the UI
-            new Thread() {
-                @Override
-                public void run() {
-                    // Wait for the binder to be ready
-                    localBinder.waitForReady();
-
-                    // Now make the binder visible
-                    managerBinder = localBinder;
-
-                    // Start updates
-                    startComputerUpdates();
-
-                    // Force a keypair to be generated early to avoid discovery delays
-                    new AndroidCryptoProvider(PcView.this).getClientCertificate();
-                }
-            }.start();
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            managerBinder = null;
-        }
-    };
-
-    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 final static int RESUME_ID = 6;
-    private final static int QUIT_ID = 7;
-
-    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);
-
-        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);
-            }
-        });
-
-        getFragmentManager().beginTransaction()
-            .replace(R.id.pcFragmentContainer, new AdapterFragment())
-            .commitAllowingStateLoss();
-
-        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);
-
-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
-
-        // Bind to the computer manager service
-        bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
-                Service.BIND_AUTO_CREATE);
-
-        pcGridAdapter = new PcGridAdapter(this,
-                PreferenceConfiguration.readPreferences(this).listMode,
-                PreferenceConfiguration.readPreferences(this).smallIconMode);
-
-        initializeViews();
-    }
-
-    private void startComputerUpdates() {
-        if (managerBinder != null) {
-            if (runningPolling) {
-                return;
-            }
-
-            freezeUpdates = false;
-            managerBinder.startPolling(new ComputerManagerListener() {
-                @Override
-                public void notifyComputerUpdated(final ComputerDetails details) {
-                    if (!freezeUpdates) {
-                        PcView.this.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                updateComputer(details);
-                            }
-                        });
-                    }
-                }
-            });
-            runningPolling = true;
-        }
-    }
-
-    private void stopComputerUpdates(boolean wait) {
-        if (managerBinder != null) {
-            if (!runningPolling) {
-                return;
-            }
-
-            freezeUpdates = true;
-
-            managerBinder.stopPolling();
-
-            if (wait) {
-                managerBinder.waitForPollingStopped();
-            }
-
-            runningPolling = false;
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        if (managerBinder != null) {
-            unbindService(serviceConnection);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        hasResumed = true;
-        startComputerUpdates();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        hasResumed = false;
-        stopComputerUpdates(false);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        Dialog.closeDialogs();
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        stopComputerUpdates(false);
-
-        // Call superclass
-        super.onCreateContextMenu(menu, v, menuInfo);
-                
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-
-        // Inflate the context menu
-        if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE ||
-            computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            menu.add(Menu.NONE, WOL_ID, 1, getResources().getString(R.string.pcview_menu_send_wol));
-            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, getResources().getString(R.string.pcview_menu_pair_pc));
-            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
-        }
-        else {
-            if (computer.details.runningGameId != 0) {
-                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
-                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
-            }
-
-            menu.add(Menu.NONE, APP_LIST_ID, 3, getResources().getString(R.string.pcview_menu_app_list));
-
-            // FIXME: We used to be able to unpair here but it's been broken since GFE 2.1.x, so I've replaced
-            // it with delete which actually work
-            menu.add(Menu.NONE, DELETE_ID, 4, getResources().getString(R.string.pcview_menu_delete_pc));
-        }
-    }
-
-    @Override
-    public void onContextMenuClosed(Menu menu) {
-        // For some reason, this gets called again _after_ onPause() is called on this activity.
-        // We don't want to start computer updates again, so we need to keep track of whether we're paused.
-        if (hasResumed) {
-            startComputerUpdates();
-        }
-    }
-
-    private void doPair(final ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if (computer.runningGameId != 0) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_ingame), Toast.LENGTH_LONG).show();
-            return;
-        }
-        if (managerBinder == null) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        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;
-                    }
-                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-                        addr = computer.remoteIp;
-                    }
-                    else {
-                        LimeLog.warning("Unknown reachability - using local IP");
-                        addr = computer.localIp;
-                    }
-
-                    httpConn = new NvHTTP(addr,
-                            managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
-                            PlatformBinding.getCryptoProvider(PcView.this));
-                    if (httpConn.getPairState() == PairingManager.PairState.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, 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 = getResources().getString(R.string.pair_incorrect_pin);
-                        }
-                        else if (pairState == PairingManager.PairState.FAILED) {
-                            message = getResources().getString(R.string.pair_fail);
-                        }
-                        else if (pairState == PairingManager.PairState.PAIRED) {
-                            // Just navigate to the app view without displaying a toast
-                            message = null;
-                            success = true;
-                        }
-                        else {
-                            // Should be no other values
-                            message = null;
-                        }
-                    }
-                } catch (UnknownHostException e) {
-                    message = getResources().getString(R.string.error_unknown_host);
-                } catch (FileNotFoundException e) {
-                    message = getResources().getString(R.string.error_404);
-                } 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() {
-                        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.state == ComputerDetails.State.ONLINE) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.wol_pc_online), Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if (computer.macAddress == null) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.wol_no_mac), Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        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 = getResources().getString(R.string.wol_waking_msg);
-                } catch (IOException e) {
-                    message = getResources().getString(R.string.wol_fail);
-                }
-
-                final String toastMessage = message;
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-                    }
-                });
-            }
-        }).start();
-    }
-
-    private void doUnpair(final ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if (managerBinder == null) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        Toast.makeText(PcView.this, getResources().getString(R.string.unpairing), Toast.LENGTH_SHORT).show();
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                NvHTTP httpConn;
-                String message;
-                try {
-                    InetAddress addr = null;
-                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-                        addr = computer.localIp;
-                    }
-                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-                        addr = computer.remoteIp;
-                    }
-                    else {
-                        LimeLog.warning("Unknown reachability - using local IP");
-                        addr = computer.localIp;
-                    }
-
-                    httpConn = new NvHTTP(addr,
-                            managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
-                            PlatformBinding.getCryptoProvider(PcView.this));
-                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
-                        httpConn.unpair();
-                        if (httpConn.getPairState() == PairingManager.PairState.NOT_PAIRED) {
-                            message = getResources().getString(R.string.unpair_success);
-                        }
-                        else {
-                            message = getResources().getString(R.string.unpair_fail);
-                        }
-                    }
-                    else {
-                        message = getResources().getString(R.string.unpair_error);
-                    }
-                } catch (UnknownHostException e) {
-                    message = getResources().getString(R.string.error_unknown_host);
-                } catch (FileNotFoundException e) {
-                    message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
-                    message = e.getMessage();
-                }
-
-                final String toastMessage = message;
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-                    }
-                });
-            }
-        }).start();
-    }
-
-    private void doAppList(ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if (managerBinder == null) {
-            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        Intent i = new Intent(this, AppView.class);
-        i.putExtra(AppView.NAME_EXTRA, computer.name);
-        i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
-        startActivity(i);
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        final ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        switch (item.getItemId()) {
-            case PAIR_ID:
-                doPair(computer.details);
-                return true;
-
-            case UNPAIR_ID:
-                doUnpair(computer.details);
-                return true;
-
-            case WOL_ID:
-                doWakeOnLan(computer.details);
-                return true;
-
-            case DELETE_ID:
-                if (managerBinder == null) {
-                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-                    return true;
-                }
-                managerBinder.removeComputer(computer.details.name);
-                removeComputer(computer.details);
-                return true;
-
-            case APP_LIST_ID:
-                doAppList(computer.details);
-                return true;
-
-            case RESUME_ID:
-                if (managerBinder == null) {
-                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-                    return true;
-                }
-
-                ServerHelper.doStart(this, new NvApp("app", computer.details.runningGameId), computer.details, managerBinder);
-                return true;
-
-            case QUIT_ID:
-                if (managerBinder == null) {
-                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-                    return true;
-                }
-
-                // Display a confirmation dialog first
-                UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
-                    @Override
-                    public void run() {
-                        ServerHelper.doQuit(PcView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer.details),
-                                new NvApp("app", 0), managerBinder, null);
-                    }
-                }, null);
-                return true;
-
-            default:
-                return super.onContextItemSelected(item);
-        }
-    }
-    
-    private void removeComputer(ComputerDetails details) {
-        for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-            ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-
-            if (details.equals(computer.details)) {
-                pcGridAdapter.removeComputer(computer);
-                pcGridAdapter.notifyDataSetChanged();
-
-                if (pcGridAdapter.getCount() == 0) {
-                    // Show the "Discovery in progress" view
-                    noPcFoundLayout.setVisibility(View.VISIBLE);
-                }
-
-                break;
-            }
-        }
-    }
-    
-    private void updateComputer(ComputerDetails details) {
-        ComputerObject existingEntry = null;
-
-        for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-            ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-
-            // Check if this is the same computer
-            if (details.uuid.equals(computer.details.uuid)) {
-                existingEntry = computer;
-                break;
-            }
-        }
-
-        if (existingEntry != null) {
-            // Replace the information in the existing entry
-            existingEntry.details = details;
-        }
-        else {
-            // Add a new entry
-            pcGridAdapter.addComputer(new ComputerObject(details));
-
-            // Remove the "Discovery in progress" view
-            noPcFoundLayout.setVisibility(View.INVISIBLE);
-        }
-
-        // Notify the view that the data has changed
-        pcGridAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    public int getAdapterFragmentLayoutId() {
-        return PreferenceConfiguration.readPreferences(this).listMode ?
-                R.layout.list_view : (PreferenceConfiguration.readPreferences(this).smallIconMode ?
-                R.layout.pc_grid_view_small : R.layout.pc_grid_view);
-    }
-
-    @Override
-    public void receiveAbsListView(AbsListView listView) {
-        listView.setAdapter(pcGridAdapter);
-        listView.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 ||
-                    computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-                    // Open the context menu if a PC is offline or refreshing
-                    openContextMenu(arg1);
-                } else if (computer.details.pairState != PairState.PAIRED) {
-                    // Pair an unpaired machine by default
-                    doPair(computer.details);
-                } else {
-                    doAppList(computer.details);
-                }
-            }
-        });
-        registerForContextMenu(listView);
-    }
-
-    public class ComputerObject {
-        public ComputerDetails details;
-
-        public ComputerObject(ComputerDetails details) {
-            if (details == null) {
-                throw new IllegalArgumentException("details must not be null");
-            }
-            this.details = details;
-        }
-
-        @Override
-        public String toString() {
-            return details.name;
-        }
-    }
-}
@@ -1,6 +0,0 @@
-package com.limelight;
-
-/* This is a dummy class to allow for a separate icon
- * and launcher for TV.
- */
-public class PcViewTv extends PcView {}
@@ -1,102 +0,0 @@
-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 {
-
-    private AudioTrack track;
-
-    @Override
-    public boolean streamInitialized(int channelCount, int channelMask, int samplesPerFrame, int sampleRate) {
-        int channelConfig;
-        int bufferSize;
-        int bytesPerFrame = (samplesPerFrame * 2);
-
-        switch (channelCount)
-        {
-        case 1:
-            channelConfig = AudioFormat.CHANNEL_OUT_MONO;
-            break;
-        case 2:
-            channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-            break;
-        case 4:
-            channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
-            break;
-        case 6:
-            channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
-            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 = bytesPerFrame * 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),
-                    bytesPerFrame * 2);
-
-            // Round to next frame
-            bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
-
-            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;
-    }
-}
@@ -1,283 +0,0 @@
-package com.limelight.binding.crypto;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-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.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.util.Base64;
-
-import com.limelight.LimeLog;
-import com.limelight.nvstream.http.LimelightCryptoProvider;
-
-public class AndroidCryptoProvider implements LimelightCryptoProvider {
-
-    private final File certFile;
-    private final File keyFile;
-
-    private X509Certificate cert;
-    private RSAPrivateKey key;
-    private byte[] pemCertBytes;
-
-    private static final Object globalCryptoLock = new Object();
-
-    static {
-        // Install the Bouncy Castle provider
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public AndroidCryptoProvider(Context c) {
-        String dataPath = c.getFilesDir().getAbsolutePath();
-
-        certFile = new File(dataPath + File.separator + "client.crt");
-        keyFile = new File(dataPath + File.separator + "client.key");
-    }
-
-    private byte[] loadFileToBytes(File f) {
-        if (!f.exists()) {
-            return null;
-        }
-
-        try {
-            FileInputStream fin = new FileInputStream(f);
-            byte[] fileData = new byte[(int) f.length()];
-            if (fin.read(fileData) != f.length()) {
-                // Failed to read
-                fileData = null;
-            }
-            fin.close();
-            return fileData;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-    private boolean loadCertKeyPair() {
-        byte[] certBytes = loadFileToBytes(certFile);
-        byte[] keyBytes = loadFileToBytes(keyFile);
-
-        // If either file was missing, we definitely can't succeed
-        if (certBytes == null || keyBytes == null) {
-            LimeLog.info("Missing cert or key; need to generate a new one");
-            return false;
-        }
-
-        try {
-            CertificateFactory certFactory = CertificateFactory.getInstance("X.509", "BC");
-            cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certBytes));
-            pemCertBytes = certBytes;
-            KeyFactory keyFactory = KeyFactory.getInstance("RSA", "BC");
-            key = (RSAPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
-        } catch (CertificateException e) {
-            // May happen if the cert is corrupt
-            LimeLog.warning("Corrupted certificate");
-            return false;
-        } catch (NoSuchAlgorithmException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
-        } catch (InvalidKeySpecException e) {
-            // May happen if the key is corrupt
-            LimeLog.warning("Corrupted key");
-            return false;
-        } catch (NoSuchProviderException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
-        }
-
-        return true;
-    }
-
-    @SuppressLint("TrulyRandom")
-    private boolean generateCertKeyPair() {
-        byte[] snBytes = new byte[8];
-        new SecureRandom().nextBytes(snBytes);
-
-        KeyPair keyPair;
-        try {
-            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC");
-            keyPairGenerator.initialize(2048);
-            keyPair = keyPairGenerator.generateKeyPair();
-        } catch (NoSuchAlgorithmException e1) {
-            // Should never happen
-            e1.printStackTrace();
-            return false;
-        } catch (NoSuchProviderException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
-        }
-
-        Date now = new Date();
-
-        // Expires in 20 years
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(now);
-        calendar.add(Calendar.YEAR, 20);
-        Date expirationDate = calendar.getTime();
-
-        BigInteger serial = new BigInteger(snBytes).abs();
-
-        X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-        nameBuilder.addRDN(BCStyle.CN, "NVIDIA GameStream Client");
-        X500Name name = nameBuilder.build();
-
-        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());
-            cert = new JcaX509CertificateConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME).getCertificate(certBuilder.build(sigGen));
-            key = (RSAPrivateKey) keyPair.getPrivate();
-        } catch (Exception e) {
-            // Nothing should go wrong here
-            e.printStackTrace();
-            return false;
-        }
-
-        LimeLog.info("Generated a new key pair");
-
-        // Save the resulting pair
-        saveCertKeyPair();
-
-        return true;
-    }
-
-    private void saveCertKeyPair() {
-        try {
-            FileOutputStream certOut = new FileOutputStream(certFile);
-            FileOutputStream keyOut = new FileOutputStream(keyFile);
-
-            // Write the certificate in OpenSSL PEM format (important for the server)
-            StringWriter strWriter = new StringWriter();
-            JcaPEMWriter pemWriter = new JcaPEMWriter(strWriter);
-            pemWriter.writeObject(cert);
-            pemWriter.close();
-
-            // Line endings MUST be UNIX for the PC to accept the cert properly
-            OutputStreamWriter certWriter = new OutputStreamWriter(certOut);
-            String pemStr = strWriter.getBuffer().toString();
-            for (int i = 0; i < pemStr.length(); i++) {
-                char c = pemStr.charAt(i);
-                if (c != '\r')
-                    certWriter.append(c);
-            }
-            certWriter.close();
-
-            // Write the private out in PKCS8 format
-            keyOut.write(key.getEncoded());
-
-            certOut.close();
-            keyOut.close();
-
-            LimeLog.info("Saved generated key pair to disk");
-        } catch (IOException e) {
-            // This isn't good because it means we'll have
-            // to re-pair next time
-            e.printStackTrace();
-        }
-    }
-
-    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 (globalCryptoLock) {
-            // Return a loaded cert if we have one
-            if (cert != null) {
-                return cert;
-            }
-
-            // No loaded cert yet, let's see if we have one on disk
-            if (loadCertKeyPair()) {
-                // Got one
-                return cert;
-            }
-
-            // Try to generate a new key pair
-            if (!generateCertKeyPair()) {
-                // Failed
-                return null;
-            }
-
-            // Load the generated pair
-            loadCertKeyPair();
-            return cert;
-        }
-    }
-
-    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 (globalCryptoLock) {
-            // Return a loaded key if we have one
-            if (key != null) {
-                return key;
-            }
-
-            // No loaded key yet, let's see if we have one on disk
-            if (loadCertKeyPair()) {
-                // Got one
-                return key;
-            }
-
-            // Try to generate a new key pair
-            if (!generateCertKeyPair()) {
-                // Failed
-                return null;
-            }
-
-            // Load the generated pair
-            loadCertKeyPair();
-            return key;
-        }
-    }
-
-    public byte[] getPemEncodedClientCertificate() {
-        synchronized (globalCryptoLock) {
-            // Call our helper function to do the cert loading/generation for us
-            getClientCertificate();
-
-            // Return a cached value if we have it
-            return pemCertBytes;
-        }
-    }
-
-    @Override
-    public String encodeBase64String(byte[] data) {
-        return Base64.encodeToString(data, Base64.NO_WRAP);
-    }
-}
@@ -1,976 +0,0 @@
-package com.limelight.binding.input;
-
-import android.hardware.input.InputManager;
-import android.os.SystemClock;
-import android.util.SparseArray;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-import com.limelight.LimeLog;
-import com.limelight.binding.input.driver.UsbDriverListener;
-import com.limelight.nvstream.NvConnection;
-import com.limelight.nvstream.input.ControllerPacket;
-import com.limelight.ui.GameGestures;
-import com.limelight.utils.Vector2d;
-
-public class ControllerHandler implements InputManager.InputDeviceListener, UsbDriverListener {
-
-    private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
-
-    private static final int START_DOWN_TIME_KEYB_MS = 750;
-
-    private static final int 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 final Vector2d inputVector = new Vector2d();
-
-    private final SparseArray<InputDeviceContext> inputDeviceContexts = new SparseArray<>();
-    private final SparseArray<UsbDeviceContext> usbDeviceContexts = new SparseArray<>();
-
-    private final NvConnection conn;
-    private final double stickDeadzone;
-    private final InputDeviceContext defaultContext = new InputDeviceContext();
-    private final GameGestures gestures;
-    private boolean hasGameController;
-
-    private final boolean multiControllerEnabled;
-    private short currentControllers;
-
-    public ControllerHandler(NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
-        this.conn = conn;
-        this.gestures = gestures;
-        this.multiControllerEnabled = multiControllerEnabled;
-
-        // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
-        // is required for controller batching support to work.
-        deadzonePercentage = 10;
-
-        int[] ids = InputDevice.getDeviceIds();
-        for (int id : ids) {
-            InputDevice dev = InputDevice.getDevice(id);
-            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 context for events with no device
-        defaultContext.leftStickXAxis = MotionEvent.AXIS_X;
-        defaultContext.leftStickYAxis = MotionEvent.AXIS_Y;
-        defaultContext.leftStickDeadzoneRadius = (float) stickDeadzone;
-        defaultContext.rightStickXAxis = MotionEvent.AXIS_Z;
-        defaultContext.rightStickYAxis = MotionEvent.AXIS_RZ;
-        defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
-        defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-        defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
-        defaultContext.controllerNumber = (short) 0;
-    }
-
-    private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
-        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;
-    }
-
-    @Override
-    public void onInputDeviceAdded(int deviceId) {
-        // Nothing happening here yet
-    }
-
-    @Override
-    public void onInputDeviceRemoved(int deviceId) {
-        InputDeviceContext context = inputDeviceContexts.get(deviceId);
-        if (context != null) {
-            LimeLog.info("Removed controller: "+context.name+" ("+deviceId+")");
-            releaseControllerNumber(context);
-            inputDeviceContexts.remove(deviceId);
-        }
-    }
-
-    @Override
-    public void onInputDeviceChanged(int deviceId) {
-        // Remove and re-add 
-        onInputDeviceRemoved(deviceId);
-        onInputDeviceAdded(deviceId);
-    }
-
-    private void releaseControllerNumber(GenericControllerContext context) {
-        // If this device sent data as a gamepad, zero the values before removing
-        if (context.assignedControllerNumber) {
-            conn.sendControllerInput(context.controllerNumber, (short) 0,
-                    (byte) 0, (byte) 0,
-                    (short) 0, (short) 0,
-                    (short) 0, (short) 0);
-        }
-
-        // If we reserved a controller number, remove that reservation
-        if (context.reservedControllerNumber) {
-            LimeLog.info("Controller number "+context.controllerNumber+" is now available");
-            currentControllers &= ~(1 << context.controllerNumber);
-        }
-    }
-
-    // Called before sending input but after we've determined that this
-    // is definitely a controller (not a keyboard, mouse, or something else)
-    private void assignControllerNumberIfNeeded(GenericControllerContext context) {
-        if (context.assignedControllerNumber) {
-            return;
-        }
-
-        if (context instanceof InputDeviceContext) {
-            InputDeviceContext devContext = (InputDeviceContext) context;
-
-            LimeLog.info(devContext.name+" ("+context.id+") needs a controller number assigned");
-            if (devContext.name != null && devContext.name.contains("gpio-keys")) {
-                // This is the back button on Shield portable consoles
-                LimeLog.info("Built-in buttons hardcoded as controller 0");
-                context.controllerNumber = 0;
-            }
-            else if (multiControllerEnabled && devContext.hasJoystickAxes) {
-                context.controllerNumber = 0;
-
-                LimeLog.info("Reserving the next available controller number");
-                for (short i = 0; i < 4; i++) {
-                    if ((currentControllers & (1 << i)) == 0) {
-                        // Found an unused controller value
-                        currentControllers |= (1 << i);
-                        context.controllerNumber = i;
-                        context.reservedControllerNumber = true;
-                        break;
-                    }
-                }
-            }
-            else {
-                LimeLog.info("Not reserving a controller number");
-                context.controllerNumber = 0;
-            }
-        }
-        else {
-            if (multiControllerEnabled) {
-                context.controllerNumber = 0;
-
-                LimeLog.info("Reserving the next available controller number");
-                for (short i = 0; i < 4; i++) {
-                    if ((currentControllers & (1 << i)) == 0) {
-                        // Found an unused controller value
-                        currentControllers |= (1 << i);
-                        context.controllerNumber = i;
-                        context.reservedControllerNumber = true;
-                        break;
-                    }
-                }
-            }
-            else {
-                LimeLog.info("Not reserving a controller number");
-                context.controllerNumber = 0;
-            }
-        }
-
-        LimeLog.info("Assigned as controller "+context.controllerNumber);
-        context.assignedControllerNumber = true;
-    }
-
-    private UsbDeviceContext createUsbDeviceContextForDevice(int deviceId) {
-        UsbDeviceContext context = new UsbDeviceContext();
-
-        context.id = deviceId;
-
-        context.leftStickDeadzoneRadius = (float) stickDeadzone;
-        context.rightStickDeadzoneRadius = (float) stickDeadzone;
-        context.triggerDeadzone = 0.13f;
-
-        return context;
-    }
-
-    private InputDeviceContext createInputDeviceContextForDevice(InputDevice dev) {
-        InputDeviceContext context = new InputDeviceContext();
-        String devName = dev.getName();
-
-        LimeLog.info("Creating controller context for device: "+devName);
-
-        context.name = devName;
-        context.id = dev.getId();
-
-        context.leftStickXAxis = MotionEvent.AXIS_X;
-        context.leftStickYAxis = MotionEvent.AXIS_Y;
-        if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
-                getMotionRangeForJoystickAxis(dev, context.leftStickYAxis) != null) {
-            // This is a gamepad
-            hasGameController = true;
-            context.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)
-            context.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
-            context.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
-        }
-        else if (brakeRange != null && gasRange != null)
-        {
-            // Others use GAS and BRAKE (like Moga)
-            context.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-            context.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
-                    context.rightStickXAxis = MotionEvent.AXIS_RX;
-                    context.rightStickYAxis = MotionEvent.AXIS_RY;
-
-                    // Xbox controllers use Z and RZ for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_Z;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RZ;
-                    context.triggersIdleNegative = true;
-                    context.isXboxController = true;
-                }
-                else {
-                    // DS4 controller uses RX and RY for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
-                    context.triggersIdleNegative = true;
-
-                    context.isDualShock4 = true;
-                }
-            }
-        }
-
-        if (context.rightStickXAxis == -1 && context.rightStickYAxis == -1) {
-            InputDevice.MotionRange zRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z);
-            InputDevice.MotionRange rzRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ);
-
-            // Most other controllers use Z and RZ for the right stick
-            if (zRange != null && rzRange != null) {
-                context.rightStickXAxis = MotionEvent.AXIS_Z;
-                context.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) {
-                    context.rightStickXAxis = MotionEvent.AXIS_RX;
-                    context.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) {
-            context.hatXAxis = MotionEvent.AXIS_HAT_X;
-            context.hatYAxis = MotionEvent.AXIS_HAT_Y;
-        }
-
-        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
-            context.leftStickDeadzoneRadius = (float) stickDeadzone;
-        }
-
-        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
-            context.rightStickDeadzoneRadius = (float) stickDeadzone;
-        }
-
-        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
-            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, context.leftTriggerAxis);
-            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, context.rightTriggerAxis);
-
-            // It's important to have a valid deadzone so controller packet batching works properly
-            context.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
-
-            // For triggers without (valid) deadzones, we'll use 13% (around XInput's default)
-            if (context.triggerDeadzone < 0.13f ||
-                context.triggerDeadzone > 0.30f)
-            {
-                context.triggerDeadzone = 0.13f;
-            }
-        }
-
-        // Ignore the back buttonn if a controller has both buttons
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-            boolean[] hasSelectKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
-            if (hasSelectKey[0] && hasSelectKey[1]) {
-                LimeLog.info("Ignoring back button because select is present");
-                context.ignoreBack = true;
-            }
-        }
-
-        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]) {
-                        context.backIsStart = true;
-                        context.modeIsSelect = true;
-                    }
-                }
-
-                // The ASUS Gamepad has triggers that sit far forward and are prone to false presses
-                // so we increase the deadzone on them to minimize this
-                context.triggerDeadzone = 0.30f;
-            }
-            // Classify this device as a remote by name
-            else if (devName.contains("Fire TV Remote") || devName.contains("Nexus Remote")) {
-                // It's only a remote if it doesn't any sticks
-                if (!context.hasJoystickAxes) {
-                    context.ignoreBack = true;
-                }
-            }
-            // SHIELD controllers will use small stick deadzones
-            else if (devName.contains("SHIELD")) {
-                context.leftStickDeadzoneRadius = 0.07f;
-                context.rightStickDeadzoneRadius = 0.07f;
-            }
-            // Samsung's face buttons appear as a non-virtual button so we'll explicitly ignore
-            // back presses on this device
-            else if (devName.equals("sec_touchscreen") || devName.equals("sec_touchkey")) {
-                context.ignoreBack = true;
-            }
-            // The Serval has a couple of unknown buttons that are start and select. It also has
-            // a back button which we want to ignore since there's already a select button.
-            else if (devName.contains("Razer Serval")) {
-                context.isServal = true;
-                context.ignoreBack = true;
-            }
-        }
-
-        LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
-        LimeLog.info("Trigger deadzone: "+context.triggerDeadzone);
-
-        return context;
-    }
-
-    private InputDeviceContext getContextForDevice(InputDevice dev) {
-        // Unknown devices use the default context
-        if (dev == null) {
-            return defaultContext;
-        }
-
-        // Return the existing context if it exists
-        InputDeviceContext context = inputDeviceContexts.get(dev.getId());
-        if (context != null) {
-            return context;
-        }
-
-        // Otherwise create a new context
-        context = createInputDeviceContextForDevice(dev);
-        inputDeviceContexts.put(dev.getId(), context);
-
-        return context;
-    }
-
-    private void sendControllerInputPacket(GenericControllerContext context) {
-        assignControllerNumberIfNeeded(context);
-        conn.sendControllerInput(context.controllerNumber, context.inputMap,
-                context.leftTrigger, context.rightTrigger,
-                context.leftStickX, context.leftStickY,
-                context.rightStickX, context.rightStickY);
-    }
-
-    // Return a valid keycode, 0 to consume, or -1 to not consume the event
-    // Device MAY BE NULL
-    private int handleRemapping(InputDeviceContext context, KeyEvent event) {
-        // Don't capture the back button if configured
-        if (context.ignoreBack) {
-            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
-                return -1;
-            }
-        }
-
-        if (context.isDualShock4) {
-            switch (event.getKeyCode()) {
-            case KeyEvent.KEYCODE_BUTTON_Y:
-                return KeyEvent.KEYCODE_BUTTON_L1;
-
-            case KeyEvent.KEYCODE_BUTTON_Z:
-                return KeyEvent.KEYCODE_BUTTON_R1;
-
-            case KeyEvent.KEYCODE_BUTTON_C:
-                return KeyEvent.KEYCODE_BUTTON_B;
-
-            case KeyEvent.KEYCODE_BUTTON_X:
-                return KeyEvent.KEYCODE_BUTTON_Y;
-
-            case KeyEvent.KEYCODE_BUTTON_B:
-                return KeyEvent.KEYCODE_BUTTON_A;
-
-            case KeyEvent.KEYCODE_BUTTON_A:
-                return KeyEvent.KEYCODE_BUTTON_X;
-
-            case KeyEvent.KEYCODE_BUTTON_SELECT:
-                return KeyEvent.KEYCODE_BUTTON_THUMBL;
-
-            case KeyEvent.KEYCODE_BUTTON_START:
-                return KeyEvent.KEYCODE_BUTTON_THUMBR;
-
-            case KeyEvent.KEYCODE_BUTTON_L2:
-                return KeyEvent.KEYCODE_BUTTON_SELECT;
-
-            case KeyEvent.KEYCODE_BUTTON_R2:
-                return KeyEvent.KEYCODE_BUTTON_START;
-
-            // These are duplicate trigger events
-            case KeyEvent.KEYCODE_BUTTON_R1:
-            case KeyEvent.KEYCODE_BUTTON_L1:
-                return 0;
-            }
-        }
-        // If this is a Serval controller sending an unknown key code, it's probably
-        // the start and select buttons
-        else if (context.isServal && event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
-            switch (event.getScanCode())  {
-                case 314:
-                    return KeyEvent.KEYCODE_BUTTON_SELECT;
-                case 315:
-                    return KeyEvent.KEYCODE_BUTTON_START;
-            }
-        }
-
-        if (context.hatXAxis != -1 && context.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 (context.hatXAxis == -1 &&
-                 context.hatYAxis == -1 &&
-                 context.isXboxController &&
-                 event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
-            // If there's not a proper Xbox controller mapping, we'll translate the raw d-pad
-            // scan codes into proper key codes
-            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
-            context.backIsStart = false;
-        }
-        else if (keyCode == KeyEvent.KEYCODE_BUTTON_SELECT) {
-            // Don't use mode as select if we have a select
-            context.modeIsSelect = false;
-        }
-        else if (context.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
-            // Emulate the start button with back
-            return KeyEvent.KEYCODE_BUTTON_START;
-        }
-        else if (context.modeIsSelect && keyCode == KeyEvent.KEYCODE_BUTTON_MODE) {
-            // Emulate the select button with mode
-            return KeyEvent.KEYCODE_BUTTON_SELECT;
-        }
-
-        return keyCode;
-    }
-
-    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(InputDeviceContext context, float lsX, float lsY, float rsX,
-                               float rsY, float lt, float rt, float hatX, float hatY) {
-
-        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
-            Vector2d leftStickVector = populateCachedVector(lsX, lsY);
-
-            handleDeadZone(leftStickVector, context.leftStickDeadzoneRadius);
-
-            context.leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
-            context.leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
-        }
-
-        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
-            Vector2d rightStickVector = populateCachedVector(rsX, rsY);
-
-            handleDeadZone(rightStickVector, context.rightStickDeadzoneRadius);
-
-            context.rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
-            context.rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
-        }
-
-        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
-            if (context.triggersIdleNegative) {
-                lt = (lt + 1) / 2;
-                rt = (rt + 1) / 2;
-            }
-
-            if (lt <= context.triggerDeadzone) {
-                lt = 0;
-            }
-            if (rt <= context.triggerDeadzone) {
-                rt = 0;
-            }
-
-            context.leftTrigger = (byte)(lt * 0xFF);
-            context.rightTrigger = (byte)(rt * 0xFF);
-        }
-
-        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
-            context.inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
-            if (hatX < -0.5) {
-                context.inputMap |= ControllerPacket.LEFT_FLAG;
-            }
-            else if (hatX > 0.5) {
-                context.inputMap |= ControllerPacket.RIGHT_FLAG;
-            }
-
-            context.inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
-            if (hatY < -0.5) {
-                context.inputMap |= ControllerPacket.UP_FLAG;
-            }
-            else if (hatY > 0.5) {
-                context.inputMap |= ControllerPacket.DOWN_FLAG;
-            }
-        }
-
-        sendControllerInputPacket(context);
-    }
-
-    public boolean handleMotionEvent(MotionEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
-        float lsX = 0, lsY = 0, rsX = 0, rsY = 0, rt = 0, lt = 0, hatX = 0, hatY = 0;
-
-        // We purposefully ignore the historical values in the motion event as it makes
-        // the controller feel sluggish for some users.
-
-        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
-            lsX = event.getAxisValue(context.leftStickXAxis);
-            lsY = event.getAxisValue(context.leftStickYAxis);
-        }
-
-        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
-            rsX = event.getAxisValue(context.rightStickXAxis);
-            rsY = event.getAxisValue(context.rightStickYAxis);
-        }
-
-        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
-            lt = event.getAxisValue(context.leftTriggerAxis);
-            rt = event.getAxisValue(context.rightTriggerAxis);
-        }
-
-        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
-            hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X);
-            hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
-        }
-
-        handleAxisSet(context, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
-
-        return true;
-    }
-
-    public boolean handleButtonUp(KeyEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
-
-        int keyCode = handleRemapping(context, 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:
-            context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_START:
-        case KeyEvent.KEYCODE_MENU:
-            if (SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_KEYB_MS) {
-                // FIXME: The stock keyboard doesn't have controller focus so isn't usable. I'm not enabling this shortcut
-                // until we have a custom keyboard or some other fix
-                //gestures.showKeyboard();
-            }
-            context.inputMap &= ~ControllerPacket.PLAY_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BACK:
-        case KeyEvent.KEYCODE_BUTTON_SELECT:
-            context.inputMap &= ~ControllerPacket.BACK_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_LEFT:
-            context.inputMap &= ~ControllerPacket.LEFT_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_RIGHT:
-            context.inputMap &= ~ControllerPacket.RIGHT_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_UP:
-            context.inputMap &= ~ControllerPacket.UP_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_DOWN:
-            context.inputMap &= ~ControllerPacket.DOWN_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_B:
-            context.inputMap &= ~ControllerPacket.B_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_CENTER:
-        case KeyEvent.KEYCODE_BUTTON_A:
-            context.inputMap &= ~ControllerPacket.A_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_X:
-            context.inputMap &= ~ControllerPacket.X_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_Y:
-            context.inputMap &= ~ControllerPacket.Y_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_L1:
-            context.inputMap &= ~ControllerPacket.LB_FLAG;
-            context.lastLbUpTime = SystemClock.uptimeMillis();
-            break;
-        case KeyEvent.KEYCODE_BUTTON_R1:
-            context.inputMap &= ~ControllerPacket.RB_FLAG;
-            context.lastRbUpTime = SystemClock.uptimeMillis();
-            break;
-        case KeyEvent.KEYCODE_BUTTON_THUMBL:
-            context.inputMap &= ~ControllerPacket.LS_CLK_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_THUMBR:
-            context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_L2:
-            context.leftTrigger = 0;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_R2:
-            context.rightTrigger = 0;
-            break;
-        default:
-            return false;
-        }
-
-        // Check if we're emulating the select button
-        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
-        {
-            // If either start or LB is up, select comes up too
-            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-                (context.inputMap & ControllerPacket.LB_FLAG) == 0)
-            {
-                context.inputMap &= ~ControllerPacket.BACK_FLAG;
-
-                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
-
-                try {
-                    Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
-                } catch (InterruptedException ignored) {}
-            }
-        }
-
-        // Check if we're emulating the special button
-        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
-        {
-            // If either start or select and RB is up, the special button comes up too
-            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-                ((context.inputMap & ControllerPacket.BACK_FLAG) == 0 &&
-                 (context.inputMap & ControllerPacket.RB_FLAG) == 0))
-            {
-                context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
-
-                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
-
-                try {
-                    Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
-                } catch (InterruptedException ignored) {}
-            }
-        }
-
-        sendControllerInputPacket(context);
-        return true;
-    }
-
-    public boolean handleButtonDown(KeyEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
-
-        int keyCode = handleRemapping(context, event);
-        if (keyCode == 0) {
-            return true;
-        }
-
-        switch (keyCode) {
-        case KeyEvent.KEYCODE_BUTTON_MODE:
-            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_START:
-        case KeyEvent.KEYCODE_MENU:
-            if (event.getRepeatCount() == 0) {
-                context.startDownTime = SystemClock.uptimeMillis();
-            }
-            context.inputMap |= ControllerPacket.PLAY_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BACK:
-        case KeyEvent.KEYCODE_BUTTON_SELECT:
-            context.inputMap |= ControllerPacket.BACK_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_LEFT:
-            context.inputMap |= ControllerPacket.LEFT_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_RIGHT:
-            context.inputMap |= ControllerPacket.RIGHT_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_UP:
-            context.inputMap |= ControllerPacket.UP_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_DOWN:
-            context.inputMap |= ControllerPacket.DOWN_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_B:
-            context.inputMap |= ControllerPacket.B_FLAG;
-            break;
-        case KeyEvent.KEYCODE_DPAD_CENTER:
-        case KeyEvent.KEYCODE_BUTTON_A:
-            context.inputMap |= ControllerPacket.A_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_X:
-            context.inputMap |= ControllerPacket.X_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_Y:
-            context.inputMap |= ControllerPacket.Y_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_L1:
-            context.inputMap |= ControllerPacket.LB_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_R1:
-            context.inputMap |= ControllerPacket.RB_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_THUMBL:
-            context.inputMap |= ControllerPacket.LS_CLK_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_THUMBR:
-            context.inputMap |= ControllerPacket.RS_CLK_FLAG;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_L2:
-            context.leftTrigger = (byte)0xFF;
-            break;
-        case KeyEvent.KEYCODE_BUTTON_R2:
-            context.rightTrigger = (byte)0xFF;
-            break;
-        default:
-            return false;
-        }
-
-        // Start+LB acts like select for controllers with one button
-        if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-            ((context.inputMap & ControllerPacket.LB_FLAG) != 0 ||
-              SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
-        {
-            context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
-            context.inputMap |= ControllerPacket.BACK_FLAG;
-
-            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
-        }
-
-        // We detect select+start or start+RB as the special button combo
-        if (((context.inputMap & ControllerPacket.RB_FLAG) != 0 ||
-             (SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-             (context.inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-            (context.inputMap & ControllerPacket.PLAY_FLAG) != 0)
-        {
-            context.inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
-            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
-
-            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
-        }
-
-        // Send a new input packet if this is the first instance of a button down event
-        // or anytime if we're emulating a button
-        if (event.getRepeatCount() == 0 || context.emulatingButtonFlags != 0) {
-            sendControllerInputPacket(context);
-        }
-        return true;
-    }
-
-    @Override
-    public void reportControllerState(int controllerId, short buttonFlags,
-                                      float leftStickX, float leftStickY,
-                                      float rightStickX, float rightStickY,
-                                      float leftTrigger, float rightTrigger) {
-        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
-
-        Vector2d leftStickVector = populateCachedVector(leftStickX, leftStickY);
-
-        handleDeadZone(leftStickVector, context.leftStickDeadzoneRadius);
-
-        context.leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
-        context.leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
-
-        Vector2d rightStickVector = populateCachedVector(rightStickX, rightStickY);
-
-        handleDeadZone(rightStickVector, context.rightStickDeadzoneRadius);
-
-        context.rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
-        context.rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
-
-        if (leftTrigger <= context.triggerDeadzone) {
-            leftTrigger = 0;
-        }
-        if (rightTrigger <= context.triggerDeadzone) {
-            rightTrigger = 0;
-        }
-
-        context.leftTrigger = (byte)(leftTrigger * 0xFF);
-        context.rightTrigger = (byte)(rightTrigger * 0xFF);
-
-        context.inputMap = buttonFlags;
-
-        sendControllerInputPacket(context);
-    }
-
-    @Override
-    public void deviceRemoved(int controllerId) {
-        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
-        if (context != null) {
-            LimeLog.info("Removed controller: "+controllerId);
-            releaseControllerNumber(context);
-            usbDeviceContexts.remove(controllerId);
-        }
-    }
-
-    @Override
-    public void deviceAdded(int controllerId) {
-        UsbDeviceContext context = createUsbDeviceContextForDevice(controllerId);
-        usbDeviceContexts.put(controllerId, context);
-    }
-
-    class GenericControllerContext {
-        public int id;
-
-        public float leftStickDeadzoneRadius;
-        public float rightStickDeadzoneRadius;
-        public float triggerDeadzone;
-
-        public boolean assignedControllerNumber;
-        public boolean reservedControllerNumber;
-        public short controllerNumber;
-
-        public short inputMap = 0x0000;
-        public byte leftTrigger = 0x00;
-        public byte rightTrigger = 0x00;
-        public short rightStickX = 0x0000;
-        public short rightStickY = 0x0000;
-        public short leftStickX = 0x0000;
-        public short leftStickY = 0x0000;
-    }
-
-    class InputDeviceContext extends GenericControllerContext {
-        public String name;
-
-        public int leftStickXAxis = -1;
-        public int leftStickYAxis = -1;
-
-        public int rightStickXAxis = -1;
-        public int rightStickYAxis = -1;
-
-        public int leftTriggerAxis = -1;
-        public int rightTriggerAxis = -1;
-        public boolean triggersIdleNegative;
-
-        public int hatXAxis = -1;
-        public int hatYAxis = -1;
-
-        public boolean isDualShock4;
-        public boolean isXboxController;
-        public boolean isServal;
-        public boolean backIsStart;
-        public boolean modeIsSelect;
-        public boolean ignoreBack;
-        public boolean hasJoystickAxes;
-
-        public int emulatingButtonFlags = 0;
-
-        // Used for OUYA bumper state tracking since they force all buttons
-        // up when the OUYA button goes down. We watch the last time we get
-        // a bumper up and compare that to our maximum delay when we receive
-        // a Start button press to see if we should activate one of our
-        // emulated button combos.
-        public long lastLbUpTime = 0;
-        public long lastRbUpTime = 0;
-
-        public long startDownTime = 0;
-    }
-
-    class UsbDeviceContext extends GenericControllerContext {}
-}
@@ -1,231 +0,0 @@
-package com.limelight.binding.input;
-
-import com.limelight.nvstream.NvConnection;
-import com.limelight.nvstream.input.MouseButtonPacket;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class TouchContext {
-    private int lastTouchX = 0;
-    private int lastTouchY = 0;
-    private int originalTouchX = 0;
-    private int originalTouchY = 0;
-    private long originalTouchTime = 0;
-    private boolean cancelled;
-    private boolean confirmedMove;
-    private boolean confirmedDrag;
-    private Timer dragTimer;
-    private double distanceMoved;
-
-    private final NvConnection conn;
-    private final int actionIndex;
-    private final double xFactor;
-    private final double yFactor;
-
-    private static final int TAP_MOVEMENT_THRESHOLD = 20;
-    private static final int TAP_DISTANCE_THRESHOLD = 25;
-    private static final int TAP_TIME_THRESHOLD = 250;
-    private static final int DRAG_TIME_THRESHOLD = 650;
-
-    public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
-    {
-        this.conn = conn;
-        this.actionIndex = actionIndex;
-        this.xFactor = xFactor;
-        this.yFactor = yFactor;
-    }
-
-    public int getActionIndex()
-    {
-        return actionIndex;
-    }
-
-    private boolean isWithinTapBounds(int touchX, int touchY)
-    {
-        int xDelta = Math.abs(touchX - originalTouchX);
-        int yDelta = Math.abs(touchY - originalTouchY);
-        return xDelta <= TAP_MOVEMENT_THRESHOLD &&
-                yDelta <= TAP_MOVEMENT_THRESHOLD;
-    }
-
-    private boolean isTap()
-    {
-        long timeDelta = System.currentTimeMillis() - originalTouchTime;
-
-        return isWithinTapBounds(lastTouchX, lastTouchY) && 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();
-        cancelled = confirmedDrag = confirmedMove = false;
-        distanceMoved = 0;
-
-        if (actionIndex == 0) {
-            // Start the timer for engaging a drag
-            startDragTimer();
-        }
-
-        return true;
-    }
-
-    public void touchUpEvent(int eventX, int eventY)
-    {
-        if (cancelled) {
-            return;
-        }
-
-        // Cancel the drag timer
-        cancelDragTimer();
-
-        byte buttonIndex = getMouseButtonIndex();
-
-        if (confirmedDrag) {
-            // Raise the button after a drag
-            conn.sendMouseButtonUp(buttonIndex);
-        }
-        else if (isTap())
-        {
-            // 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);
-        }
-    }
-
-    private synchronized void startDragTimer() {
-        dragTimer = new Timer(true);
-        dragTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                synchronized (TouchContext.this) {
-                    // Check if someone already set move
-                    if (confirmedMove) {
-                        return;
-                    }
-
-                    // Check if someone cancelled us
-                    if (dragTimer == null) {
-                        return;
-                    }
-
-                    // Uncancellable now
-                    dragTimer = null;
-
-                    // We haven't been cancelled before the timer expired so begin dragging
-                    confirmedDrag = true;
-                    conn.sendMouseButtonDown(getMouseButtonIndex());
-                }
-            }
-        }, DRAG_TIME_THRESHOLD);
-    }
-
-    private synchronized void cancelDragTimer() {
-        if (dragTimer != null) {
-            dragTimer.cancel();
-            dragTimer = null;
-        }
-    }
-
-    private synchronized void checkForConfirmedMove(int eventX, int eventY) {
-        // If we've already confirmed something, get out now
-        if (confirmedMove || confirmedDrag) {
-            return;
-        }
-
-        // If it leaves the tap bounds before the drag time expires, it's a move.
-        if (!isWithinTapBounds(eventX, eventY)) {
-            confirmedMove = true;
-            cancelDragTimer();
-            return;
-        }
-
-        // Check if we've exceeded the maximum distance moved
-        distanceMoved += Math.sqrt(Math.pow(eventX - lastTouchX, 2) + Math.pow(eventY - lastTouchY, 2));
-        if (distanceMoved >= TAP_DISTANCE_THRESHOLD) {
-            confirmedMove = true;
-            cancelDragTimer();
-            return;
-        }
-    }
-
-    public boolean touchMoveEvent(int eventX, int eventY)
-    {
-        if (eventX != lastTouchX || eventY != lastTouchY)
-        {
-            // We only send moves and drags for the primary touch point
-            if (actionIndex == 0) {
-                checkForConfirmedMove(eventX, eventY);
-
-                int deltaX = eventX - lastTouchX;
-                int deltaY = eventY - lastTouchY;
-
-                // Scale the deltas based on the factors passed to our constructor
-                deltaX = (int)Math.round((double)Math.abs(deltaX) * xFactor);
-                deltaY = (int)Math.round((double)Math.abs(deltaY) * yFactor);
-
-                // Fix up the signs
-                if (eventX < lastTouchX) {
-                    deltaX = -deltaX;
-                }
-                if (eventY < lastTouchY) {
-                    deltaY = -deltaY;
-                }
-
-                // If the scaling factor ended up rounding deltas to zero, wait until they are
-                // non-zero to update lastTouch that way devices that report small touch events often
-                // will work correctly
-                if (deltaX != 0) {
-                    lastTouchX = eventX;
-                }
-                if (deltaY != 0) {
-                    lastTouchY = eventY;
-                }
-
-                conn.sendMouseMove((short)deltaX, (short)deltaY);
-            }
-            else {
-                lastTouchX = eventX;
-                lastTouchY = eventY;
-            }
-        }
-
-        return true;
-    }
-
-    public void cancelTouch() {
-        cancelled = true;
-
-        // Cancel the drag timer
-        cancelDragTimer();
-
-        // If it was a confirmed drag, we'll need to raise the button now
-        if (confirmedDrag) {
-            conn.sendMouseButtonUp(getMouseButtonIndex());
-        }
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-}
@@ -1,11 +0,0 @@
-package com.limelight.binding.input.driver;
-
-public interface UsbDriverListener {
-    void reportControllerState(int controllerId, short buttonFlags,
-                               float leftStickX, float leftStickY,
-                               float rightStickX, float rightStickY,
-                               float leftTrigger, float rightTrigger);
-
-    void deviceRemoved(int controllerId);
-    void deviceAdded(int controllerId);
-}
@@ -1,170 +0,0 @@
-package com.limelight.binding.input.driver;
-
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbDeviceConnection;
-import android.hardware.usb.UsbManager;
-import android.os.Binder;
-import android.os.IBinder;
-
-import com.limelight.LimeLog;
-
-import java.util.ArrayList;
-
-public class UsbDriverService extends Service implements UsbDriverListener {
-
-    private static final String ACTION_USB_PERMISSION =
-            "com.limelight.USB_PERMISSION";
-
-    private UsbManager usbManager;
-
-    private final UsbEventReceiver receiver = new UsbEventReceiver();
-    private final UsbDriverBinder binder = new UsbDriverBinder();
-
-    private final ArrayList<XboxOneController> controllers = new ArrayList<>();
-
-    private UsbDriverListener listener;
-    private static int nextDeviceId;
-
-    @Override
-    public void reportControllerState(int controllerId, short buttonFlags, float leftStickX, float leftStickY, float rightStickX, float rightStickY, float leftTrigger, float rightTrigger) {
-        // Call through to the client's listener
-        if (listener != null) {
-            listener.reportControllerState(controllerId, buttonFlags, leftStickX, leftStickY, rightStickX, rightStickY, leftTrigger, rightTrigger);
-        }
-    }
-
-    @Override
-    public void deviceRemoved(int controllerId) {
-        // Remove the the controller from our list (if not removed already)
-        for (XboxOneController controller : controllers) {
-            if (controller.getControllerId() == controllerId) {
-                controllers.remove(controller);
-                break;
-            }
-        }
-
-        // Call through to the client's listener
-        if (listener != null) {
-            listener.deviceRemoved(controllerId);
-        }
-    }
-
-    @Override
-    public void deviceAdded(int controllerId) {
-        // Call through to the client's listener
-        if (listener != null) {
-            listener.deviceAdded(controllerId);
-        }
-    }
-
-    public class UsbEventReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-
-            // Initial attachment broadcast
-            if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
-                UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
-
-                // Continue the state machine
-                handleUsbDeviceState(device);
-            }
-            // Subsequent permission dialog completion intent
-            else if (action.equals(ACTION_USB_PERMISSION)) {
-                UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
-
-                // If we got this far, we've already found we're able to handle this device
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    handleUsbDeviceState(device);
-                }
-            }
-        }
-    }
-
-    public class UsbDriverBinder extends Binder {
-        public void setListener(UsbDriverListener listener) {
-            UsbDriverService.this.listener = listener;
-
-            // Report all controllerMap that already exist
-            if (listener != null) {
-                for (XboxOneController controller : controllers) {
-                    listener.deviceAdded(controller.getControllerId());
-                }
-            }
-        }
-    }
-
-    private void handleUsbDeviceState(UsbDevice device) {
-        // Are we able to operate it?
-        if (XboxOneController.canClaimDevice(device)) {
-            // Do we have permission yet?
-            if (!usbManager.hasPermission(device)) {
-                // Let's ask for permission
-                usbManager.requestPermission(device, PendingIntent.getBroadcast(UsbDriverService.this, 0, new Intent(ACTION_USB_PERMISSION), 0));
-                return;
-            }
-
-            // Open the device
-            UsbDeviceConnection connection = usbManager.openDevice(device);
-            if (connection == null) {
-                LimeLog.warning("Unable to open USB device: "+device.getDeviceName());
-                return;
-            }
-
-            // Try to initialize it
-            XboxOneController controller = new XboxOneController(device, connection, nextDeviceId++, this);
-            if (!controller.start()) {
-                connection.close();
-                return;
-            }
-
-            // Add this controller to the list
-            controllers.add(controller);
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        this.usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
-
-        // Register for USB attach broadcasts and permission completions
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
-        filter.addAction(ACTION_USB_PERMISSION);
-        registerReceiver(receiver, filter);
-
-        // Enumerate existing devices
-        for (UsbDevice dev : usbManager.getDeviceList().values()) {
-            if (XboxOneController.canClaimDevice(dev)) {
-                // Start the process of claiming this device
-                handleUsbDeviceState(dev);
-            }
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        // Stop the attachment receiver
-        unregisterReceiver(receiver);
-
-        // Remove listeners
-        listener = null;
-
-        // Stop all controllers
-        while (controllers.size() > 0) {
-            // Stop and remove the controller
-            controllers.remove(0).stop();
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return binder;
-    }
-}
@@ -1,233 +0,0 @@
-package com.limelight.binding.input.driver;
-
-import android.hardware.usb.UsbConstants;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbDeviceConnection;
-import android.hardware.usb.UsbEndpoint;
-import android.hardware.usb.UsbInterface;
-
-import com.limelight.LimeLog;
-import com.limelight.binding.video.MediaCodecHelper;
-import com.limelight.nvstream.input.ControllerPacket;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-public class XboxOneController {
-    private final UsbDevice device;
-    private final UsbDeviceConnection connection;
-    private final int deviceId;
-
-    private Thread inputThread;
-    private UsbDriverListener listener;
-    private boolean stopped;
-
-    private short buttonFlags;
-    private float leftTrigger, rightTrigger;
-    private float rightStickX, rightStickY;
-    private float leftStickX, leftStickY;
-
-    private static final int MICROSOFT_VID = 0x045e;
-    private static final int XB1_IFACE_SUBCLASS = 71;
-    private static final int XB1_IFACE_PROTOCOL = 208;
-
-    // FIXME: odata_serial
-    private static final byte[] XB1_INIT_DATA = {0x05, 0x20, 0x00, 0x01, 0x00};
-
-    public XboxOneController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
-        this.device = device;
-        this.connection = connection;
-        this.deviceId = deviceId;
-        this.listener = listener;
-    }
-
-    public int getControllerId() {
-        return this.deviceId;
-    }
-
-    private void setButtonFlag(int buttonFlag, int data) {
-        if (data != 0) {
-            buttonFlags |= buttonFlag;
-        }
-        else {
-            buttonFlags &= ~buttonFlag;
-        }
-    }
-
-    private void reportInput() {
-        listener.reportControllerState(deviceId, buttonFlags, leftStickX, leftStickY,
-                rightStickX, rightStickY, leftTrigger, rightTrigger);
-    }
-
-    private void processButtons(ByteBuffer buffer) {
-        byte b = buffer.get();
-
-        setButtonFlag(ControllerPacket.PLAY_FLAG, b & 0x04);
-        setButtonFlag(ControllerPacket.BACK_FLAG, b & 0x08);
-
-        setButtonFlag(ControllerPacket.A_FLAG, b & 0x10);
-        setButtonFlag(ControllerPacket.B_FLAG, b & 0x20);
-        setButtonFlag(ControllerPacket.X_FLAG, b & 0x40);
-        setButtonFlag(ControllerPacket.Y_FLAG, b & 0x80);
-
-        b = buffer.get();
-        setButtonFlag(ControllerPacket.LEFT_FLAG, b & 0x04);
-        setButtonFlag(ControllerPacket.RIGHT_FLAG, b & 0x08);
-        setButtonFlag(ControllerPacket.UP_FLAG, b & 0x01);
-        setButtonFlag(ControllerPacket.DOWN_FLAG, b & 0x02);
-
-        setButtonFlag(ControllerPacket.LB_FLAG, b & 0x10);
-        setButtonFlag(ControllerPacket.RB_FLAG, b & 0x20);
-
-        setButtonFlag(ControllerPacket.LS_CLK_FLAG, b & 0x40);
-        setButtonFlag(ControllerPacket.RS_CLK_FLAG, b & 0x80);
-
-        leftTrigger = buffer.getShort() / 1023.0f;
-        rightTrigger = buffer.getShort() / 1023.0f;
-
-        leftStickX = buffer.getShort() / 32767.0f;
-        leftStickY = ~buffer.getShort() / 32767.0f;
-
-        rightStickX = buffer.getShort() / 32767.0f;
-        rightStickY = ~buffer.getShort() / 32767.0f;
-
-        reportInput();
-    }
-
-    private void processPacket(ByteBuffer buffer) {
-        switch (buffer.get())
-        {
-            case 0x20:
-                buffer.position(buffer.position()+3);
-                processButtons(buffer);
-                break;
-
-            case 0x07:
-                buffer.position(buffer.position() + 3);
-                setButtonFlag(ControllerPacket.SPECIAL_BUTTON_FLAG, buffer.get() & 0x01);
-                reportInput();
-                break;
-        }
-    }
-
-    private void startInputThread(final UsbEndpoint inEndpt) {
-        inputThread = new Thread() {
-            public void run() {
-                while (!isInterrupted() && !stopped) {
-                    byte[] buffer = new byte[64];
-
-                    int res;
-
-                    //
-                    // There's no way that I can tell to determine if a device has failed
-                    // or if the timeout has simply expired. We'll check how long the transfer
-                    // took to fail and assume the device failed if it happened before the timeout
-                    // expired.
-                    //
-
-                    do {
-                        // Read the next input state packet
-                        long lastMillis = MediaCodecHelper.getMonotonicMillis();
-                        res = connection.bulkTransfer(inEndpt, buffer, buffer.length, 3000);
-                        if (res == -1 && MediaCodecHelper.getMonotonicMillis() - lastMillis < 1000) {
-                            LimeLog.warning("Detected device I/O error");
-                            XboxOneController.this.stop();
-                            break;
-                        }
-                    } while (res == -1 && !isInterrupted() && !stopped);
-
-                    if (res == -1 || stopped) {
-                        break;
-                    }
-
-                    processPacket(ByteBuffer.wrap(buffer, 0, res).order(ByteOrder.LITTLE_ENDIAN));
-                }
-            }
-        };
-        inputThread.setName("Xbox One Controller - Input Thread");
-        inputThread.start();
-    }
-
-    public boolean start() {
-        // Force claim all interfaces
-        for (int i = 0; i < device.getInterfaceCount(); i++) {
-            UsbInterface iface = device.getInterface(i);
-
-            if (!connection.claimInterface(iface, true)) {
-                LimeLog.warning("Failed to claim interfaces");
-                return false;
-            }
-        }
-
-        // Find the endpoints
-        UsbEndpoint outEndpt = null;
-        UsbEndpoint inEndpt = null;
-        UsbInterface iface = device.getInterface(0);
-        for (int i = 0; i < iface.getEndpointCount(); i++) {
-            UsbEndpoint endpt = iface.getEndpoint(i);
-            if (endpt.getDirection() == UsbConstants.USB_DIR_IN) {
-                if (inEndpt != null) {
-                    LimeLog.warning("Found duplicate IN endpoint");
-                    return false;
-                }
-                inEndpt = endpt;
-            }
-            else if (endpt.getDirection() == UsbConstants.USB_DIR_OUT) {
-                if (outEndpt != null) {
-                    LimeLog.warning("Found duplicate OUT endpoint");
-                    return false;
-                }
-                outEndpt = endpt;
-            }
-        }
-
-        // Make sure the required endpoints were present
-        if (inEndpt == null || outEndpt == null) {
-            LimeLog.warning("Missing required endpoint");
-            return false;
-        }
-
-        // Send the initialization packet
-        int res = connection.bulkTransfer(outEndpt, XB1_INIT_DATA, XB1_INIT_DATA.length, 3000);
-        if (res != XB1_INIT_DATA.length) {
-            LimeLog.warning("Initialization transfer failed: "+res);
-            return false;
-        }
-
-        // Start listening for controller input
-        startInputThread(inEndpt);
-
-        // Report this device added via the listener
-        listener.deviceAdded(deviceId);
-
-        return true;
-    }
-
-    public void stop() {
-        if (stopped) {
-            return;
-        }
-
-        stopped = true;
-
-        // Stop the input thread
-        if (inputThread != null) {
-            inputThread.interrupt();
-            inputThread = null;
-        }
-
-        // Report the device removed
-        listener.deviceRemoved(deviceId);
-
-        // Close the USB connection
-        connection.close();
-    }
-
-    public static boolean canClaimDevice(UsbDevice device) {
-        return device.getVendorId() == MICROSOFT_VID &&
-                device.getInterfaceCount() >= 1 &&
-                device.getInterface(0).getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
-                device.getInterface(0).getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
-                device.getInterface(0).getInterfaceProtocol() == XB1_IFACE_PROTOCOL;
-    }
-}
@@ -1,37 +0,0 @@
-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 final short type;
-    public final short code;
-    public final int value;
-
-    public EvdevEvent(short type, short code, int value) {
-        this.type = type;
-        this.code = code;
-        this.value = value;
-    }
-}
@@ -1,235 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import android.content.Context;
-
-import com.limelight.LimeLog;
-
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-public class EvdevHandler {
-
-    private final EvdevListener listener;
-    private final String libraryPath;
-
-    private boolean shutdown = false;
-    private InputStream evdevIn;
-    private OutputStream evdevOut;
-    private Process su;
-    private ServerSocket servSock;
-    private Socket evdevSock;
-
-    private static final byte UNGRAB_REQUEST = 1;
-    private static final byte REGRAB_REQUEST = 2;
-
-    private final Thread handlerThread = new Thread() {
-        @Override
-        public void run() {
-            int deltaX = 0;
-            int deltaY = 0;
-            byte deltaScroll = 0;
-
-            // Bind a local listening socket for evdevreader to connect to
-            try {
-                servSock = new ServerSocket(0, 1);
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-
-            // Launch a su shell
-            ProcessBuilder builder = new ProcessBuilder("su");
-            builder.redirectErrorStream(true);
-
-            try {
-                su = builder.start();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-
-            // Start evdevreader
-            DataOutputStream suOut = new DataOutputStream(su.getOutputStream());
-            try {
-                suOut.writeChars(libraryPath+File.separatorChar+"libevdev_reader.so "+servSock.getLocalPort()+"\n");
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-
-            // Wait for evdevreader's connection
-            LimeLog.info("Waiting for EvdevReader connection to port "+servSock.getLocalPort());
-            try {
-                evdevSock = servSock.accept();
-                evdevIn = evdevSock.getInputStream();
-                evdevOut = evdevSock.getOutputStream();
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-            LimeLog.info("EvdevReader connected from port "+evdevSock.getPort());
-
-            while (!isInterrupted() && !shutdown) {
-                EvdevEvent event;
-                try {
-                    event = EvdevReader.read(evdevIn);
-                } catch (IOException e) {
-                    event = null;
-                }
-                if (event == null) {
-                    break;
-                }
-
-                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;
-                }
-            }
-        }
-    };
-
-    public EvdevHandler(Context context, EvdevListener listener) {
-        this.listener = listener;
-        this.libraryPath = context.getApplicationInfo().nativeLibraryDir;
-    }
-
-    public void regrabAll() {
-        if (!shutdown && evdevOut != null) {
-            try {
-                evdevOut.write(REGRAB_REQUEST);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void ungrabAll() {
-        if (!shutdown && evdevOut != null) {
-            try {
-                evdevOut.write(UNGRAB_REQUEST);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void start() {
-        handlerThread.start();
-    }
-
-    public void stop() {
-        // We need to stop the process in this context otherwise
-        // we could get stuck waiting on output from the process
-        // in order to terminate it.
-
-        shutdown = true;
-        handlerThread.interrupt();
-
-        if (servSock != null) {
-            try {
-                servSock.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (evdevSock != null) {
-            try {
-                evdevSock.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (evdevIn != null) {
-            try {
-                evdevIn.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (evdevOut != null) {
-            try {
-                evdevOut.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (su != null) {
-            su.destroy();
-        }
-
-        try {
-            handlerThread.join();
-        } catch (InterruptedException ignored) {}
-    }
-}
@@ -1,12 +0,0 @@
-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);
-}
@@ -1,58 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import com.limelight.LimeLog;
-
-public class EvdevReader {
-    private static void readAll(InputStream in, ByteBuffer bb) throws IOException {
-        byte[] buf = bb.array();
-        int ret;
-        int offset = 0;
-
-        while (offset < buf.length) {
-            ret = in.read(buf, offset, buf.length-offset);
-            if (ret <= 0) {
-                throw new IOException("Read failed: "+ret);
-            }
-
-            offset += ret;
-        }
-    }
-
-    // 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(InputStream input) throws IOException {
-        ByteBuffer bb;
-        int packetLength;
-
-        // Read the packet length
-        bb = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder());
-        readAll(input, bb);
-        packetLength = bb.getInt();
-
-        if (packetLength < EvdevEvent.EVDEV_MIN_EVENT_SIZE) {
-            LimeLog.warning("Short read: "+packetLength);
-            return null;
-        }
-
-        // Read the rest of the packet
-        bb = ByteBuffer.allocate(packetLength).order(ByteOrder.nativeOrder());
-        readAll(input, bb);
-
-        // Throw away the time stamp
-        if (packetLength == EvdevEvent.EVDEV_MAX_EVENT_SIZE) {
-            bb.getLong();
-            bb.getLong();
-        } else {
-            bb.getInt();
-            bb.getInt();
-        }
-
-        return new EvdevEvent(bb.getShort(), bb.getShort(), bb.getInt());
-    }
-}
@@ -1,139 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import android.view.KeyEvent;
-
-public class EvdevTranslator {
-
-    private 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;
-    }
-
-}
@@ -1,359 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.view.MotionEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This is a analog stick on screen element. It is used to get 2-Axis user input.
- */
-public class AnalogStick extends VirtualControllerElement {
-
-    /**
-     * outer radius size in percent of the ui element
-     */
-    public static final int SIZE_RADIUS_COMPLETE = 90;
-    /**
-     * analog stick size in percent of the ui element
-     */
-    public static final int SIZE_RADIUS_ANALOG_STICK = 90;
-    /**
-     * dead zone size in percent of the ui element
-     */
-    public static final int SIZE_RADIUS_DEADZONE = 90;
-    /**
-     * time frame for a double click
-     */
-    public final static long timeoutDoubleClick = 250;
-
-    /**
-     * Listener interface to update registered observers.
-     */
-    public interface AnalogStickListener {
-
-        /**
-         * onMovement event will be fired on real analog stick movement (outside of the deadzone).
-         *
-         * @param x horizontal position, value from -1.0 ... 0 .. 1.0
-         * @param y vertical position, value from -1.0 ... 0 .. 1.0
-         */
-        void onMovement(float x, float y);
-
-        /**
-         * onClick event will be fired on click on the analog stick
-         */
-        void onClick();
-
-        /**
-         * onDoubleClick event will be fired on a double click in a short time frame on the analog
-         * stick.
-         */
-        void onDoubleClick();
-
-        /**
-         * onRevoke event will be fired on unpress of the analog stick.
-         */
-        void onRevoke();
-    }
-
-    /**
-     * Movement states of the analog sick.
-     */
-    private enum STICK_STATE {
-        NO_MOVEMENT,
-        MOVED_IN_DEAD_ZONE,
-        MOVED_ACTIVE
-    }
-
-    /**
-     * Click type states.
-     */
-    private enum CLICK_STATE {
-        SINGLE,
-        DOUBLE
-    }
-
-    /**
-     * configuration if the analog stick should be displayed as circle or square
-     */
-    private boolean circle_stick = true; // TODO: implement square sick for simulations
-
-    /**
-     * outer radius, this size will be automatically updated on resize
-     */
-    private float radius_complete = 0;
-    /**
-     * analog stick radius, this size will be automatically updated on resize
-     */
-    private float radius_analog_stick = 0;
-    /**
-     * dead zone radius, this size will be automatically updated on resize
-     */
-    private float radius_dead_zone = 0;
-
-    /**
-     * horizontal position in relation to the center of the element
-     */
-    private float relative_x = 0;
-    /**
-     * vertical position in relation to the center of the element
-     */
-    private float relative_y = 0;
-
-
-    private double movement_radius = 0;
-    private double movement_angle = 0;
-
-    private float position_stick_x = 0;
-    private float position_stick_y = 0;
-
-    private final Paint paint = new Paint();
-
-    private STICK_STATE stick_state = STICK_STATE.NO_MOVEMENT;
-    private CLICK_STATE click_state = CLICK_STATE.SINGLE;
-
-    private List<AnalogStickListener> listeners = new ArrayList<>();
-    private long timeLastClick = 0;
-
-    private static double getMovementRadius(float x, float y) {
-        // corner cases
-        if (x == 0) {
-            return y > 0 ? y : -y;
-        }
-        if (y == 0) {
-            return x > 0 ? x : -x;
-        }
-        // return hypotenuse (pythagoras)
-        return Math.sqrt(x * x + y * y);
-    }
-
-    private static double getAngle(float way_x, float way_y) {
-        // prevent divisions by zero for corner cases
-        if (way_x == 0) {
-            return way_y < 0 ? Math.PI : 0;
-        } else if (way_y == 0) {
-            if (way_x > 0) {
-                return Math.PI * 3 / 2;
-            } else if (way_x < 0) {
-                return Math.PI * 1 / 2;
-            }
-        }
-        // return correct calculated angle for each quadrant
-        if (way_x > 0) {
-            if (way_y < 0) {
-                // first quadrant
-                return 3 * Math.PI / 2 + Math.atan((double) (-way_y / way_x));
-            } else {
-                // second quadrant
-                return Math.PI + Math.atan((double) (way_x / way_y));
-            }
-        } else {
-            if (way_y > 0) {
-                // third quadrant
-                return Math.PI / 2 + Math.atan((double) (way_y / -way_x));
-            } else {
-                // fourth quadrant
-                return 0 + Math.atan((double) (-way_x / -way_y));
-            }
-        }
-    }
-
-    public AnalogStick(VirtualController controller, Context context) {
-        super(controller, context);
-        // reset stick position
-        position_stick_x = getWidth() / 2;
-        position_stick_y = getHeight() / 2;
-    }
-
-    public void addAnalogStickListener(AnalogStickListener listener) {
-        listeners.add(listener);
-    }
-
-    private void notifyOnMovement(float x, float y) {
-        _DBG("movement x: " + x + " movement y: " + y);
-        // notify listeners
-        for (AnalogStickListener listener : listeners) {
-            listener.onMovement(x, y);
-        }
-    }
-
-    private void notifyOnClick() {
-        _DBG("click");
-        // notify listeners
-        for (AnalogStickListener listener : listeners) {
-            listener.onClick();
-        }
-    }
-
-    private void notifyOnDoubleClick() {
-        _DBG("double click");
-        // notify listeners
-        for (AnalogStickListener listener : listeners) {
-            listener.onDoubleClick();
-        }
-    }
-
-    private void notifyOnRevoke() {
-        _DBG("revoke");
-        // notify listeners
-        for (AnalogStickListener listener : listeners) {
-            listener.onRevoke();
-        }
-    }
-
-    public void setColors(int normalColor, int pressedColor) {
-        this.normalColor = normalColor;
-        this.pressedColor = pressedColor;
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        // calculate new radius sizes depending
-        radius_complete = getPercent(getCorrectWidth() / 2, 90);
-        radius_dead_zone = getPercent(getCorrectWidth() / 2, 30);
-        radius_analog_stick = getPercent(getCorrectWidth() / 2, 20);
-
-        super.onSizeChanged(w, h, oldw, oldh);
-    }
-
-    @Override
-    protected void onElementDraw(Canvas canvas) {
-        // set transparent background
-        canvas.drawColor(Color.TRANSPARENT);
-
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(getPercent(getCorrectWidth() / 2, 2));
-
-        // draw outer circle
-        if (!isPressed() || click_state == CLICK_STATE.SINGLE) {
-            paint.setColor(normalColor);
-        } else {
-            paint.setColor(pressedColor);
-        }
-        canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_complete, paint);
-
-        paint.setColor(normalColor);
-        // draw dead zone
-        canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_dead_zone, paint);
-
-        // draw stick depending on state
-        switch (stick_state) {
-            case NO_MOVEMENT: {
-                paint.setColor(normalColor);
-                canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_analog_stick, paint);
-                break;
-            }
-            case MOVED_IN_DEAD_ZONE: {
-                paint.setColor(normalColor);
-                canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint);
-
-                break;
-            }
-            case MOVED_ACTIVE: {
-                paint.setColor(pressedColor);
-                canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint);
-                break;
-            }
-        }
-    }
-
-    private void updatePosition() {
-        // get 100% way
-        float complete = (radius_complete - radius_analog_stick - radius_dead_zone);
-
-        // calculate relative way
-        float correlated_y = (float) (Math.sin(Math.PI / 2 - movement_angle) * (movement_radius));
-        float correlated_x = (float) (Math.cos(Math.PI / 2 - movement_angle) * (movement_radius));
-
-        // update positions
-        position_stick_x = getWidth() / 2 - correlated_x;
-        position_stick_y = getHeight() / 2 - correlated_y;
-
-        // set active depending on dead zone
-        stick_state = movement_radius > radius_dead_zone ?
-                STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;
-
-        //  trigger move event if state active
-        if (stick_state == STICK_STATE.MOVED_ACTIVE) {
-            notifyOnMovement(-(1 / complete) *
-                    (correlated_x - (correlated_x > 0 ? radius_dead_zone : -radius_dead_zone)), (1 / complete) *
-                    (correlated_y - (correlated_y > 0 ? radius_dead_zone : -radius_dead_zone)));
-        }
-    }
-
-    @Override
-    public boolean onElementTouchEvent(MotionEvent event) {
-        // save last click state
-        CLICK_STATE lastClickState = click_state;
-
-        // get absolute way for each axis
-        relative_x = -(getWidth() / 2 - event.getX());
-        relative_y = -(getHeight() / 2 - event.getY());
-
-        // get radius and angel of movement from center
-        movement_radius = getMovementRadius(relative_x, relative_y);
-        movement_angle = getAngle(relative_x, relative_y);
-
-        // chop radius if out of outer circle and already pressed
-        if (movement_radius > (radius_complete - radius_analog_stick)) {
-            // not pressed already, so ignore event from outer circle
-            if (!isPressed()) {
-                return false;
-            }
-            movement_radius = radius_complete - radius_analog_stick;
-        }
-
-        // handle event depending on action
-        switch (event.getActionMasked()) {
-            // down event (touch event)
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN: {
-                // set to dead zoned, will be corrected in update position if necessary
-                stick_state = STICK_STATE.MOVED_IN_DEAD_ZONE;
-                // check for double click
-                if (lastClickState == CLICK_STATE.SINGLE &&
-                        timeLastClick + timeoutDoubleClick > System.currentTimeMillis()) {
-                    click_state = CLICK_STATE.DOUBLE;
-                    notifyOnDoubleClick();
-                } else {
-                    click_state = CLICK_STATE.SINGLE;
-                    notifyOnClick();
-                }
-                // reset last click timestamp
-                timeLastClick = System.currentTimeMillis();
-                // set item pressed and update
-                setPressed(true);
-                break;
-            }
-            // up event (revoke touch)
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP: {
-                setPressed(false);
-                break;
-            }
-        }
-
-        if (isPressed()) {
-            // when is pressed calculate new positions (will trigger movement if necessary)
-            updatePosition();
-        } else {
-            stick_state = STICK_STATE.NO_MOVEMENT;
-            notifyOnRevoke();
-            // not longer pressed reset analog stick
-            notifyOnMovement(0, 0);
-        }
-        // refresh view
-        invalidate();
-        // accept the touch event
-        return true;
-    }
-}
@@ -1,235 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.view.MotionEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * This is a digital button on screen element. It is used to get click and double click user input.
- */
-public class DigitalButton extends VirtualControllerElement {
-
-    /**
-     * Listener interface to update registered observers.
-     */
-    public interface DigitalButtonListener {
-
-        /**
-         * onClick event will be fired on button click.
-         */
-        void onClick();
-
-        /**
-         * onLongClick event will be fired on button long click.
-         */
-        void onLongClick();
-
-        /**
-         * onRelease event will be fired on button unpress.
-         */
-        void onRelease();
-    }
-
-    /**
-     *
-     */
-    private class TimerLongClickTimerTask extends TimerTask {
-        @Override
-        public void run() {
-            onLongClickCallback();
-        }
-    }
-
-    private List<DigitalButtonListener> listeners = new ArrayList<DigitalButtonListener>();
-    private String text = "";
-    private int icon = -1;
-    private long timerLongClickTimeout = 3000;
-    private Timer timerLongClick = null;
-    private TimerLongClickTimerTask longClickTimerTask = null;
-
-    private final Paint paint = new Paint();
-
-    private int layer;
-    private DigitalButton movingButton = null;
-
-    boolean inRange(float x, float y) {
-        return (this.getX() < x && this.getX() + this.getWidth() > x) &&
-                (this.getY() < y && this.getY() + this.getHeight() > y);
-    }
-
-    public boolean checkMovement(float x, float y, DigitalButton movingButton) {
-        // check if the movement happened in the same layer
-        if (movingButton.layer != this.layer) {
-            return false;
-        }
-
-        // save current pressed state
-        boolean wasPressed = isPressed();
-
-        // check if the movement directly happened on the button
-        if ((this.movingButton == null || movingButton == this.movingButton)
-                && this.inRange(x, y)) {
-            // set button pressed state depending on moving button pressed state
-            if (this.isPressed() != movingButton.isPressed()) {
-                this.setPressed(movingButton.isPressed());
-            }
-        }
-        // check if the movement is outside of the range and the movement button
-        // is the saved moving button
-        else if (movingButton == this.movingButton) {
-            this.setPressed(false);
-        }
-
-        // check if a change occurred
-        if (wasPressed != isPressed()) {
-            if (isPressed()) {
-                // is pressed set moving button and emit click event
-                this.movingButton = movingButton;
-                onClickCallback();
-            } else {
-                // no longer pressed reset moving button and emit release event
-                this.movingButton = null;
-                onReleaseCallback();
-            }
-
-            invalidate();
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private void checkMovementForAllButtons(float x, float y) {
-        for (VirtualControllerElement element : virtualController.getElements()) {
-            if (element != this && element instanceof DigitalButton) {
-                ((DigitalButton) element).checkMovement(x, y, this);
-            }
-        }
-    }
-
-    public DigitalButton(VirtualController controller, int layer, Context context) {
-        super(controller, context);
-        this.layer = layer;
-    }
-
-    public void addDigitalButtonListener(DigitalButtonListener listener) {
-        listeners.add(listener);
-    }
-
-    public void setText(String text) {
-        this.text = text;
-        invalidate();
-    }
-
-    public void setIcon(int id) {
-        this.icon = id;
-        invalidate();
-    }
-
-    @Override
-    protected void onElementDraw(Canvas canvas) {
-        // set transparent background
-        canvas.drawColor(Color.TRANSPARENT);
-
-        paint.setTextSize(getPercent(getCorrectWidth(), 50));
-        paint.setTextAlign(Paint.Align.CENTER);
-        paint.setStrokeWidth(3);
-
-        paint.setColor(isPressed() ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(1, 1, getWidth() - 1, getHeight() - 1, paint);
-
-        if (icon != -1) {
-            Drawable d = getResources().getDrawable(icon);
-            d.setBounds(5, 5, getWidth() - 5, getHeight() - 5);
-            d.draw(canvas);
-        } else {
-            paint.setStyle(Paint.Style.FILL_AND_STROKE);
-            canvas.drawText(text, getPercent(getWidth(), 50), getPercent(getHeight(), 73), paint);
-        }
-    }
-
-    private void onClickCallback() {
-        _DBG("clicked");
-        // notify listeners
-        for (DigitalButtonListener listener : listeners) {
-            listener.onClick();
-        }
-
-        timerLongClick = new Timer();
-        longClickTimerTask = new TimerLongClickTimerTask();
-        timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
-    }
-
-    private void onLongClickCallback() {
-        _DBG("long click");
-        // notify listeners
-        for (DigitalButtonListener listener : listeners) {
-            listener.onLongClick();
-        }
-    }
-
-    private void onReleaseCallback() {
-        _DBG("released");
-        // notify listeners
-        for (DigitalButtonListener listener : listeners) {
-            listener.onRelease();
-        }
-        timerLongClick.cancel();
-        longClickTimerTask.cancel();
-    }
-
-    @Override
-    public boolean onElementTouchEvent(MotionEvent event) {
-        // get masked (not specific to a pointer) action
-        float x = getX() + event.getX();
-        float y = getY() + event.getY();
-        int action = event.getActionMasked();
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN: {
-                movingButton = null;
-                setPressed(true);
-                onClickCallback();
-
-                invalidate();
-
-                return true;
-            }
-            case MotionEvent.ACTION_MOVE: {
-                checkMovementForAllButtons(x, y);
-
-                return true;
-            }
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP: {
-                setPressed(false);
-                onReleaseCallback();
-
-                checkMovementForAllButtons(x, y);
-
-                invalidate();
-
-                return true;
-            }
-            default: {
-            }
-        }
-        return true;
-    }
-}
@@ -1,202 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.view.MotionEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DigitalPad extends VirtualControllerElement {
-    public final static int DIGITAL_PAD_DIRECTION_NO_DIRECTION = 0;
-    int direction = DIGITAL_PAD_DIRECTION_NO_DIRECTION;
-    public final static int DIGITAL_PAD_DIRECTION_LEFT = 1;
-    public final static int DIGITAL_PAD_DIRECTION_UP = 2;
-    public final static int DIGITAL_PAD_DIRECTION_RIGHT = 4;
-    public final static int DIGITAL_PAD_DIRECTION_DOWN = 8;
-    List<DigitalPadListener> listeners = new ArrayList<DigitalPadListener>();
-
-    private final Paint paint = new Paint();
-
-    public DigitalPad(VirtualController controller, Context context) {
-        super(controller, context);
-    }
-
-    public void addDigitalPadListener(DigitalPadListener listener) {
-        listeners.add(listener);
-    }
-
-    @Override
-    protected void onElementDraw(Canvas canvas) {
-        // set transparent background
-        canvas.drawColor(Color.TRANSPARENT);
-
-        paint.setTextSize(getPercent(getCorrectWidth(), 20));
-        paint.setTextAlign(Paint.Align.CENTER);
-        paint.setStrokeWidth(3);
-
-        if (direction == DIGITAL_PAD_DIRECTION_NO_DIRECTION) {
-            // draw no direction rect
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(normalColor);
-            canvas.drawRect(
-                    getPercent(getWidth(), 36), getPercent(getHeight(), 36),
-                    getPercent(getWidth(), 63), getPercent(getHeight(), 63),
-                    paint
-            );
-        }
-
-        // draw left rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                0, getPercent(getHeight(), 33),
-                getPercent(getWidth(), 33), getPercent(getHeight(), 66),
-                paint
-        );
-
-        // draw left up line
-        paint.setColor((
-                        (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0 &&
-                                (direction & DIGITAL_PAD_DIRECTION_UP) > 0
-                ) ? pressedColor : normalColor
-        );
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawLine(
-                0, getPercent(getHeight(), 33),
-                getPercent(getWidth(), 33), 0,
-                paint
-        );
-
-        // draw up rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_UP) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                getPercent(getWidth(), 33), 0,
-                getPercent(getWidth(), 66), getPercent(getHeight(), 33),
-                paint
-        );
-
-        // draw up right line
-        paint.setColor((
-                        (direction & DIGITAL_PAD_DIRECTION_UP) > 0 &&
-                                (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0
-                ) ? pressedColor : normalColor
-        );
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawLine(
-                getPercent(getWidth(), 66), 0,
-                getPercent(getWidth(), 100), getPercent(getHeight(), 33),
-                paint
-        );
-
-        // draw right rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                getPercent(getWidth(), 66), getPercent(getHeight(), 33),
-                getPercent(getWidth(), 100), getPercent(getHeight(), 66),
-                paint
-        );
-
-        // draw right down line
-        paint.setColor((
-                        (direction & DIGITAL_PAD_DIRECTION_RIGHT) > 0 &&
-                                (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0
-                ) ? pressedColor : normalColor
-        );
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawLine(
-                getPercent(getWidth(), 100), getPercent(getHeight(), 66),
-                getPercent(getWidth(), 66), getPercent(getHeight(), 100),
-                paint
-        );
-
-        // draw down rect
-        paint.setColor(
-                (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0 ? pressedColor : normalColor);
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(
-                getPercent(getWidth(), 33), getPercent(getHeight(), 66),
-                getPercent(getWidth(), 66), getPercent(getHeight(), 100),
-                paint
-        );
-
-        // draw down left line
-        paint.setColor((
-                        (direction & DIGITAL_PAD_DIRECTION_DOWN) > 0 &&
-                                (direction & DIGITAL_PAD_DIRECTION_LEFT) > 0
-                ) ? pressedColor : normalColor
-        );
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawLine(
-                getPercent(getWidth(), 33), getPercent(getHeight(), 100),
-                getPercent(getWidth(), 0), getPercent(getHeight(), 66),
-                paint
-        );
-    }
-
-    private void newDirectionCallback(int direction) {
-        _DBG("direction: " + direction);
-
-        // notify listeners
-        for (DigitalPadListener listener : listeners) {
-            listener.onDirectionChange(direction);
-        }
-    }
-
-    @Override
-    public boolean onElementTouchEvent(MotionEvent event) {
-        // get masked (not specific to a pointer) action
-        switch (event.getActionMasked()) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN:
-            case MotionEvent.ACTION_MOVE: {
-                direction = 0;
-
-                if (event.getX() < getPercent(getWidth(), 33)) {
-                    direction |= DIGITAL_PAD_DIRECTION_LEFT;
-                }
-                if (event.getX() > getPercent(getWidth(), 66)) {
-                    direction |= DIGITAL_PAD_DIRECTION_RIGHT;
-                }
-                if (event.getY() > getPercent(getHeight(), 66)) {
-                    direction |= DIGITAL_PAD_DIRECTION_DOWN;
-                }
-                if (event.getY() < getPercent(getHeight(), 33)) {
-                    direction |= DIGITAL_PAD_DIRECTION_UP;
-                }
-                newDirectionCallback(direction);
-                invalidate();
-
-                return true;
-            }
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP: {
-                direction = 0;
-                newDirectionCallback(direction);
-                invalidate();
-
-                return true;
-            }
-            default: {
-            }
-        }
-
-        return true;
-    }
-
-    public interface DigitalPadListener {
-        void onDirectionChange(int direction);
-    }
-}
@@ -1,49 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-
-import com.limelight.nvstream.input.ControllerPacket;
-
-public class LeftAnalogStick extends AnalogStick {
-    public LeftAnalogStick(final VirtualController controller, final Context context) {
-        super(controller, context);
-
-        addAnalogStickListener(new AnalogStick.AnalogStickListener() {
-            @Override
-            public void onMovement(float x, float y) {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.leftStickX = (short) (x * 0x7FFE);
-                inputContext.leftStickY = (short) (y * 0x7FFE);
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onClick() {
-            }
-
-            @Override
-            public void onDoubleClick() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap |= ControllerPacket.LS_CLK_FLAG;
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onRevoke() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap &= ~ControllerPacket.LS_CLK_FLAG;
-
-                controller.sendControllerInputContext();
-            }
-        });
-    }
-}
@@ -1,36 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-
-public class LeftTrigger extends DigitalButton {
-    public LeftTrigger(final VirtualController controller, final int layer, final Context context) {
-        super(controller, layer, context);
-        addDigitalButtonListener(new DigitalButton.DigitalButtonListener() {
-            @Override
-            public void onClick() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.leftTrigger = (byte) 0xFF;
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onLongClick() {
-            }
-
-            @Override
-            public void onRelease() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.leftTrigger = (byte) 0x00;
-
-                controller.sendControllerInputContext();
-            }
-        });
-    }
-}
@@ -1,49 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-
-import com.limelight.nvstream.input.ControllerPacket;
-
-public class RightAnalogStick extends AnalogStick {
-    public RightAnalogStick(final VirtualController controller, final Context context) {
-        super(controller, context);
-
-        addAnalogStickListener(new AnalogStick.AnalogStickListener() {
-            @Override
-            public void onMovement(float x, float y) {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.rightStickX = (short) (x * 0x7FFE);
-                inputContext.rightStickY = (short) (y * 0x7FFE);
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onClick() {
-            }
-
-            @Override
-            public void onDoubleClick() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap |= ControllerPacket.RS_CLK_FLAG;
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onRevoke() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
-
-                controller.sendControllerInputContext();
-            }
-        });
-    }
-}
@@ -1,36 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-
-public class RightTrigger extends DigitalButton {
-    public RightTrigger(final VirtualController controller, final int layer, final Context context) {
-        super(controller, layer, context);
-        addDigitalButtonListener(new DigitalButton.DigitalButtonListener() {
-            @Override
-            public void onClick() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.rightTrigger = (byte) 0xFF;
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onLongClick() {
-            }
-
-            @Override
-            public void onRelease() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.rightTrigger = (byte) 0x00;
-
-                controller.sendControllerInputContext();
-            }
-        });
-    }
-}
@@ -1,149 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-
-import com.limelight.R;
-import com.limelight.nvstream.NvConnection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class VirtualController {
-    public class ControllerInputContext {
-        public short inputMap = 0x0000;
-        public byte leftTrigger = 0x00;
-        public byte rightTrigger = 0x00;
-        public short rightStickX = 0x0000;
-        public short rightStickY = 0x0000;
-        public short leftStickX = 0x0000;
-        public short leftStickY = 0x0000;
-    }
-
-    public enum ControllerMode {
-        Active,
-        Configuration
-    }
-
-    private static final boolean _PRINT_DEBUG_INFORMATION = true;
-
-    private NvConnection connection = null;
-    private Context context = null;
-
-    private FrameLayout frame_layout = null;
-    private RelativeLayout relative_layout = null;
-
-    ControllerMode currentMode = ControllerMode.Active;
-    ControllerInputContext inputContext = new ControllerInputContext();
-
-    private RelativeLayout.LayoutParams layoutParamsButtonConfigure = null;
-    private Button buttonConfigure = null;
-
-    private List<VirtualControllerElement> elements = new ArrayList<VirtualControllerElement>();
-
-    public VirtualController(final NvConnection conn, FrameLayout layout, final Context context) {
-        this.connection = conn;
-        this.frame_layout = layout;
-        this.context = context;
-
-        relative_layout = new RelativeLayout(context);
-
-        frame_layout.addView(relative_layout);
-
-        buttonConfigure = new Button(context);
-        buttonConfigure.setBackgroundResource(R.drawable.settings);
-        buttonConfigure.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (currentMode == ControllerMode.Configuration) {
-                    currentMode = ControllerMode.Active;
-                } else {
-                    currentMode = ControllerMode.Configuration;
-                }
-                Toast.makeText(context, "CHANGE MODE " + currentMode, Toast.LENGTH_SHORT).show();
-
-                relative_layout.invalidate();
-            }
-        });
-    }
-
-    public void removeElements() {
-        for (VirtualControllerElement element : elements) {
-            relative_layout.removeView(element);
-        }
-        elements.clear();
-    }
-
-    public void addElement(VirtualControllerElement element, int x, int y, int width, int height) {
-        elements.add(element);
-        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
-        layoutParams.setMargins(x, y, 0, 0);
-
-        relative_layout.addView(element, layoutParams);
-    }
-
-    public List<VirtualControllerElement> getElements() {
-        return elements;
-    }
-
-    private static final void _DBG(String text) {
-        if (_PRINT_DEBUG_INFORMATION) {
-            System.out.println("VirtualController: " + text);
-        }
-    }
-
-    public void refreshLayout() {
-        relative_layout.removeAllViews();
-        removeElements();
-
-        layoutParamsButtonConfigure = new RelativeLayout.LayoutParams(50, 50);
-        relative_layout.addView(buttonConfigure, layoutParamsButtonConfigure);
-
-        VirtualControllerConfigurationLoader.createDefaultLayout(this, context);
-    }
-
-    public ControllerMode getControllerMode() {
-        return currentMode;
-    }
-
-    public ControllerInputContext getControllerInputContext() {
-        return inputContext;
-    }
-
-    public void sendControllerInputContext() {
-        sendControllerInputPacket();
-    }
-
-    private void sendControllerInputPacket() {
-        try {
-            _DBG("INPUT_MAP + " + inputContext.inputMap);
-            _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
-            _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
-            _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
-            _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
-            _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
-
-            if (connection != null) {
-                connection.sendControllerInput(
-                        inputContext.inputMap,
-                        inputContext.leftTrigger,
-                        inputContext.rightTrigger,
-                        inputContext.leftStickX,
-                        inputContext.leftStickY,
-                        inputContext.rightStickX,
-                        inputContext.rightStickY
-                );
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
@@ -1,277 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-
-import com.limelight.nvstream.input.ControllerPacket;
-
-public class VirtualControllerConfigurationLoader {
-    private static final String PROFILE_PATH = "profiles";
-
-    private static int getPercent(
-            int percent,
-            int total) {
-        return (int) (((float) total / (float) 100) * (float) percent);
-    }
-
-    private static DigitalPad createDigitalPad(
-            final VirtualController controller,
-            final Context context) {
-
-        DigitalPad digitalPad = new DigitalPad(controller, context);
-        digitalPad.addDigitalPadListener(new DigitalPad.DigitalPadListener() {
-            @Override
-            public void onDirectionChange(int direction) {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-
-                if (direction == DigitalPad.DIGITAL_PAD_DIRECTION_NO_DIRECTION) {
-                    inputContext.inputMap &= ~ControllerPacket.LEFT_FLAG;
-                    inputContext.inputMap &= ~ControllerPacket.RIGHT_FLAG;
-                    inputContext.inputMap &= ~ControllerPacket.UP_FLAG;
-                    inputContext.inputMap &= ~ControllerPacket.DOWN_FLAG;
-
-                    controller.sendControllerInputContext();
-                    return;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_LEFT) > 0) {
-                    inputContext.inputMap |= ControllerPacket.LEFT_FLAG;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_RIGHT) > 0) {
-                    inputContext.inputMap |= ControllerPacket.RIGHT_FLAG;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_UP) > 0) {
-                    inputContext.inputMap |= ControllerPacket.UP_FLAG;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_DOWN) > 0) {
-                    inputContext.inputMap |= ControllerPacket.DOWN_FLAG;
-                }
-                controller.sendControllerInputContext();
-            }
-        });
-
-        return digitalPad;
-    }
-
-    private static DigitalButton createDigitalButton(
-            final int keyShort,
-            final int keyLong,
-            final int layer,
-            final String text,
-            final int icon,
-            final VirtualController controller,
-            final Context context) {
-        DigitalButton button = new DigitalButton(controller, layer, context);
-        button.setText(text);
-        button.setIcon(icon);
-
-        button.addDigitalButtonListener(new DigitalButton.DigitalButtonListener() {
-            @Override
-            public void onClick() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap |= keyShort;
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onLongClick() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap |= keyLong;
-
-                controller.sendControllerInputContext();
-            }
-
-            @Override
-            public void onRelease() {
-                VirtualController.ControllerInputContext inputContext =
-                        controller.getControllerInputContext();
-                inputContext.inputMap &= ~keyShort;
-                inputContext.inputMap &= ~keyLong;
-
-                controller.sendControllerInputContext();
-            }
-        });
-
-        return button;
-    }
-
-    private static DigitalButton createLeftTrigger(
-            final int layer,
-            final String text,
-            final int icon,
-            final VirtualController controller,
-            final Context context) {
-        LeftTrigger button = new LeftTrigger(controller, layer, context);
-        button.setText(text);
-        button.setIcon(icon);
-        return button;
-    }
-
-    private static DigitalButton createRightTrigger(
-            final int layer,
-            final String text,
-            final int icon,
-            final VirtualController controller,
-            final Context context) {
-        RightTrigger button = new RightTrigger(controller, layer, context);
-        button.setText(text);
-        button.setIcon(icon);
-        return button;
-    }
-
-    private static AnalogStick createLeftStick(
-            final VirtualController controller,
-            final Context context) {
-        return new LeftAnalogStick(controller, context);
-    }
-
-    private static AnalogStick createRightStick(
-            final VirtualController controller,
-            final Context context) {
-        return new RightAnalogStick(controller, context);
-    }
-
-    public static void createDefaultLayout(final VirtualController controller, final Context context) {
-
-        DisplayMetrics screen = context.getResources().getDisplayMetrics();
-
-        controller.addElement(createDigitalPad(controller, context),
-                getPercent(5, screen.widthPixels),
-                getPercent(10, screen.heightPixels),
-                getPercent(30, screen.widthPixels),
-                getPercent(40, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
-                getPercent(75, screen.widthPixels),
-                getPercent(40, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
-                getPercent(85, screen.widthPixels),
-                getPercent(30, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
-                getPercent(65, screen.widthPixels),
-                getPercent(30, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
-                getPercent(75, screen.widthPixels),
-                getPercent(20, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createLeftTrigger(
-                0, "LT", -1, controller, context),
-                getPercent(65, screen.widthPixels),
-                getPercent(20, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createRightTrigger(
-                0, "RT", -1, controller, context),
-                getPercent(85, screen.widthPixels),
-                getPercent(20, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
-                getPercent(65, screen.widthPixels),
-                getPercent(40, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
-                getPercent(85, screen.widthPixels),
-                getPercent(40, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createLeftStick(controller, context),
-                getPercent(5, screen.widthPixels),
-                getPercent(50, screen.heightPixels),
-                getPercent(40, screen.widthPixels),
-                getPercent(50, screen.heightPixels)
-        );
-
-        controller.addElement(createRightStick(controller, context),
-                getPercent(55, screen.widthPixels),
-                getPercent(50, screen.heightPixels),
-                getPercent(40, screen.widthPixels),
-                getPercent(50, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.BACK_FLAG, 0, 2, "SELECT", -1, controller, context),
-                getPercent(40, screen.widthPixels),
-                getPercent(90, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-
-        controller.addElement(createDigitalButton(
-                ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context),
-                getPercent(50, screen.widthPixels),
-                getPercent(90, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
-    }
-
-    /*
-    NOT IMPLEMENTED YET,
-    this should later be used to store and load a profile for the virtual controller
-    public static void saveProfile(final String name,
-                                   final VirtualController controller,
-                                   final Context context) {
-
-        SharedPreferences preferences = context.getSharedPreferences(PROFILE_PATH + "/" +
-                name, Activity.MODE_PRIVATE);
-
-        JSONArray elementConfigurations = new JSONArray();
-        for (VirtualControllerElement element : controller.getElements()) {
-            JSONObject elementConfiguration = new JSONObject();
-            try {
-                elementConfiguration.put("TYPE", element.getClass().getName());
-                elementConfiguration.put("CONFIGURATION", element.getConfiguration());
-                elementConfigurations.put(elementConfiguration);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        SharedPreferences.Editor editor= preferences.edit();
-        editor.putString("ELEMENTS", elementConfigurations.toString());
-    }
-
-	public static void loadFromPreferences(final VirtualController controller) {
-
-	}
-	*/
-}
@@ -1,277 +0,0 @@
-/**
- * Created by Karim Mreisi.
- */
-
-package com.limelight.binding.input.virtual_controller;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.RelativeLayout;
-
-public abstract class VirtualControllerElement extends View {
-    protected static boolean _PRINT_DEBUG_INFORMATION = false;
-
-    protected VirtualController virtualController;
-
-    private final Paint paint = new Paint();
-
-    protected int normalColor = 0xF0888888;
-    protected int pressedColor = 0xF00000FF;
-
-    protected int startSize_x;
-    protected int startSize_y;
-
-    float position_pressed_x = 0;
-    float position_pressed_y = 0;
-
-    private enum Mode {
-        Normal,
-        Resize,
-        Move
-    }
-
-    private Mode currentMode = Mode.Normal;
-
-    protected VirtualControllerElement(VirtualController controller, Context context) {
-        super(context);
-
-        this.virtualController = controller;
-    }
-
-    protected void moveElement(int pressed_x, int pressed_y, int x, int y) {
-        int newPos_x = (int) getX() + x - pressed_x;
-        int newPos_y = (int) getY() + y - pressed_y;
-
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
-
-        layoutParams.leftMargin = newPos_x > 0 ? newPos_x : 0;
-        layoutParams.topMargin = newPos_y > 0 ? newPos_y : 0;
-        layoutParams.rightMargin = 0;
-        layoutParams.bottomMargin = 0;
-
-        requestLayout();
-    }
-
-    protected void resizeElement(int pressed_x, int pressed_y, int width, int height) {
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
-
-        int newHeight = height + (startSize_y - pressed_y);
-        int newWidth = width + (startSize_x - pressed_x);
-
-        layoutParams.height = newHeight > 20 ? newHeight : 20;
-        layoutParams.width = newWidth > 20 ? newWidth : 20;
-
-        requestLayout();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (virtualController.getControllerMode() == VirtualController.ControllerMode.
-                Configuration) {
-            paint.setColor(pressedColor);
-            paint.setStrokeWidth(3);
-            paint.setStyle(Paint.Style.STROKE);
-
-            canvas.drawRect(0, 0,
-                    getWidth(), getHeight(),
-                    paint);
-        }
-
-        onElementDraw(canvas);
-
-        super.onDraw(canvas);
-    }
-
-    /*
-    protected void actionShowNormalColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog)
-			{}
-
-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				normalColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
-
-	protected void actionShowPressedColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog) {
-			}
-
-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				pressedColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
-    */
-
-    protected void actionEnableMove() {
-        currentMode = Mode.Move;
-    }
-
-    protected void actionEnableResize() {
-        currentMode = Mode.Resize;
-    }
-
-    protected void actionCancel() {
-        currentMode = Mode.Normal;
-        invalidate();
-    }
-
-    protected void showConfigurationDialog() {
-        try {
-            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
-
-            alertBuilder.setTitle("Configuration");
-
-            CharSequence functions[] = new CharSequence[]{
-                    "Move",
-                    "Resize",
-                /*election
-                "Set n
-                Disable color sormal color",
-                "Set pressed color",
-                */
-                    "Cancel"
-            };
-
-            alertBuilder.setItems(functions, new DialogInterface.OnClickListener() {
-
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    switch (which) {
-                        case 0: { // move
-                            actionEnableMove();
-                            break;
-                        }
-                        case 1: { // resize
-                            actionEnableResize();
-                            break;
-                        }
-                    /*
-                    case 2:	{ // set default color
-                        actionShowNormalColorChooser();
-                        break;
-                    }
-                    case 3:	{ // set pressed color
-                        actionShowPressedColorChooser();
-                        break;
-                    }
-                    */
-                        default: { // cancel
-                            actionCancel();
-                            break;
-                        }
-                    }
-                }
-            });
-            AlertDialog alert = alertBuilder.create();
-            // show menu
-            alert.show();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (virtualController.getControllerMode() == VirtualController.ControllerMode.Active) {
-            return onElementTouchEvent(event);
-        }
-
-        switch (event.getActionMasked()) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN: {
-                position_pressed_x = event.getX();
-                position_pressed_y = event.getY();
-                startSize_x = getWidth();
-                startSize_y = getHeight();
-
-                return true;
-            }
-            case MotionEvent.ACTION_MOVE: {
-                switch (currentMode) {
-                    case Move: {
-                        moveElement(
-                                (int) position_pressed_x,
-                                (int) position_pressed_y,
-                                (int) event.getX(),
-                                (int) event.getY());
-                        break;
-                    }
-                    case Resize: {
-                        resizeElement(
-                                (int) position_pressed_x,
-                                (int) position_pressed_y,
-                                (int) event.getX(),
-                                (int) event.getY());
-                        break;
-                    }
-                    case Normal: {
-                        break;
-                    }
-                }
-                return true;
-            }
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP: {
-                currentMode = Mode.Normal;
-                showConfigurationDialog();
-                return true;
-            }
-            default: {
-            }
-        }
-        return true;
-    }
-
-    abstract protected void onElementDraw(Canvas canvas);
-
-    abstract public boolean onElementTouchEvent(MotionEvent event);
-
-    protected static final void _DBG(String text) {
-        if (_PRINT_DEBUG_INFORMATION) {
-            System.out.println(text);
-        }
-    }
-
-    public void setColors(int normalColor, int pressedColor) {
-        this.normalColor = normalColor;
-        this.pressedColor = pressedColor;
-
-        invalidate();
-    }
-
-    protected final float getPercent(float value, float percent) {
-        return value / 100 * percent;
-    }
-
-    protected final int getCorrectWidth() {
-        return getWidth() > getHeight() ? getHeight() : getWidth();
-    }
-
-    /**
-     public JSONObject getConfiguration () {
-     JSONObject configuration = new JSONObject();
-     return  configuration;
-     }
-
-     public  void loadConfiguration (JSONObject configuration) {
-     }
-     */
-}
@@ -1,8 +0,0 @@
-package com.limelight.binding.video;
-
-import com.limelight.nvstream.av.video.VideoDecoderRenderer;
-
-public abstract class EnhancedDecoderRenderer extends VideoDecoderRenderer {
-    public abstract boolean isHevcSupported();
-    public abstract boolean isAvcSupported();
-}
@@ -1,862 +0,0 @@
-package com.limelight.binding.video;
-
-import java.nio.ByteBuffer;
-import java.util.Locale;
-import java.util.concurrent.locks.LockSupport;
-
-import org.jcodec.codecs.h264.H264Utils;
-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 com.limelight.preferences.PreferenceConfiguration;
-
-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;
-
-public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
-
-    // Used on versions < 5.0
-    private ByteBuffer[] legacyInputBuffers;
-
-    private String avcDecoderName;
-    private String hevcDecoderName;
-
-    private MediaCodec videoDecoder;
-    private Thread rendererThread;
-    private boolean needsSpsBitstreamFixup, isExynos4;
-    private VideoDepacketizer depacketizer;
-    private boolean adaptivePlayback, directSubmit;
-    private boolean constrainedHighProfile;
-    private int initialWidth, initialHeight;
-    private VideoFormat videoFormat;
-
-    private boolean needsBaselineSpsHack;
-    private SeqParameterSet savedSps;
-
-    private long lastTimestampUs;
-    private long totalTimeMs;
-    private long decoderTimeMs;
-    private int totalFrames;
-
-    private int numSpsIn;
-    private int numPpsIn;
-    private int numVpsIn;
-    private int numIframeIn;
-
-    private MediaCodecInfo findAvcDecoder() {
-        MediaCodecInfo decoder = MediaCodecHelper.findProbableSafeDecoder("video/avc", MediaCodecInfo.CodecProfileLevel.AVCProfileHigh);
-        if (decoder == null) {
-            decoder = MediaCodecHelper.findFirstDecoder("video/avc");
-        }
-        return decoder;
-    }
-
-    private MediaCodecInfo findHevcDecoder(int videoFormat) {
-        // Don't return anything if H.265 is forced off
-        if (videoFormat == PreferenceConfiguration.FORCE_H265_OFF) {
-            return null;
-        }
-
-        // We don't try the first HEVC decoder. We'd rather fall back to hardware accelerated AVC instead
-        //
-        // We need HEVC Main profile, so we could pass that constant to findProbableSafeDecoder, however
-        // some decoders (at least Qualcomm's Snapdragon 805) don't properly report support
-        // for even required levels of HEVC.
-        MediaCodecInfo decoderInfo = MediaCodecHelper.findProbableSafeDecoder("video/hevc", -1);
-        if (decoderInfo != null) {
-            if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName())) {
-                LimeLog.info("Found HEVC decoder, but it's not whitelisted - "+decoderInfo.getName());
-
-                if (videoFormat == PreferenceConfiguration.FORCE_H265_ON) {
-                    LimeLog.info("Forcing H265 enabled despite non-whitelisted decoder");
-                }
-                else {
-                    return null;
-                }
-            }
-        }
-
-        return decoderInfo;
-    }
-
-    public MediaCodecDecoderRenderer(int videoFormat) {
-        //dumpDecoders();
-
-        MediaCodecInfo avcDecoder = findAvcDecoder();
-        if (avcDecoder != null) {
-            avcDecoderName = avcDecoder.getName();
-            LimeLog.info("Selected AVC decoder: "+avcDecoderName);
-        }
-        else {
-            LimeLog.warning("No AVC decoder found");
-        }
-
-        MediaCodecInfo hevcDecoder = findHevcDecoder(videoFormat);
-        if (hevcDecoder != null) {
-            hevcDecoderName = hevcDecoder.getName();
-            LimeLog.info("Selected HEVC decoder: "+hevcDecoderName);
-        }
-        else {
-            LimeLog.info("No HEVC decoder found");
-        }
-    }
-
-    @Override
-    public boolean isHevcSupported() {
-        return hevcDecoderName != null;
-    }
-
-    @Override
-    public boolean isAvcSupported() {
-        return avcDecoderName != null;
-    }
-
-    @Override
-    public boolean setup(VideoDecoderRenderer.VideoFormat format, int width, int height, int redrawRate, Object renderTarget, int drFlags) {
-        this.initialWidth = width;
-        this.initialHeight = height;
-        this.videoFormat = format;
-
-        String mimeType;
-        String selectedDecoderName;
-
-        if (videoFormat == VideoFormat.H264) {
-            mimeType = "video/avc";
-            selectedDecoderName = avcDecoderName;
-
-            if (avcDecoderName == null) {
-                LimeLog.severe("No available AVC decoder!");
-                return false;
-            }
-
-            // These fixups only apply to H264 decoders
-            needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(selectedDecoderName);
-            needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(selectedDecoderName);
-            constrainedHighProfile = MediaCodecHelper.decoderNeedsConstrainedHighProfile(selectedDecoderName);
-            isExynos4 = MediaCodecHelper.isExynos4Device();
-            if (needsSpsBitstreamFixup) {
-                LimeLog.info("Decoder "+selectedDecoderName+" needs SPS bitstream restrictions fixup");
-            }
-            if (needsBaselineSpsHack) {
-                LimeLog.info("Decoder "+selectedDecoderName+" needs baseline SPS hack");
-            }
-            if (constrainedHighProfile) {
-                LimeLog.info("Decoder "+selectedDecoderName+" needs constrained high profile");
-            }
-            if (isExynos4) {
-                LimeLog.info("Decoder "+selectedDecoderName+" is on Exynos 4");
-            }
-        }
-        else if (videoFormat == VideoFormat.H265) {
-            mimeType = "video/hevc";
-            selectedDecoderName = hevcDecoderName;
-
-            if (hevcDecoderName == null) {
-                LimeLog.severe("No available HEVC decoder!");
-                return false;
-            }
-        }
-        else {
-            // Unknown format
-            return false;
-        }
-
-        // Set decoder-specific attributes
-        directSubmit = MediaCodecHelper.decoderCanDirectSubmit(selectedDecoderName);
-        adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(selectedDecoderName);
-
-        if (directSubmit) {
-            LimeLog.info("Decoder "+selectedDecoderName+" will use direct submit");
-        }
-
-        // Codecs have been known to throw all sorts of crazy runtime exceptions
-        // due to implementation problems
-        try {
-            videoDecoder = MediaCodec.createByCodecName(selectedDecoderName);
-        } catch (Exception e) {
-            return false;
-        }
-
-        MediaFormat videoFormat = MediaFormat.createVideoFormat(mimeType, 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);
-        }
-
-        videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
-        videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
-
-        LimeLog.info("Using codec "+selectedDecoderName+" for hardware decoding "+mimeType);
-
-        return true;
-    }
-
-    private void handleDecoderException(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());
-            }
-        }
-
-        // Only throw if this happens at the beginning of a stream
-        if (totalFrames < 60) {
-            if (buf != null || codecFlags != 0) {
-                throw new RendererException(this, e, buf, codecFlags);
-            }
-            else {
-                throw new RendererException(this, e);
-            }
-        }
-    }
-
-    private void startDirectSubmitRendererThread()
-    {
-        rendererThread = new Thread() {
-            @Override
-            public void run() {
-                BufferInfo info = new BufferInfo();
-                while (!isInterrupted()) {
-                    try {
-                        // Try to output a frame
-                        int outIndex = videoDecoder.dequeueOutputBuffer(info, 50000);
-                        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 = MediaCodecHelper.getMonotonicMillis() - (presentationTimeUs / 1000);
-                            if (delta >= 0 && delta < 1000) {
-                                decoderTimeMs += delta;
-                                totalTimeMs += delta;
-                            }
-                        } else {
-                            switch (outIndex) {
-                                case MediaCodec.INFO_TRY_AGAIN_LATER:
-                                    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(e, null, 0);
-                    }
-                }
-            }
-        };
-        rendererThread.setName("Video - Renderer (MediaCodec)");
-        rendererThread.setPriority(Thread.NORM_PRIORITY + 2);
-        rendererThread.start();
-    }
-
-    private int dequeueInputBuffer(boolean wait, boolean infiniteWait) {
-        int index;
-        long startTime, queueTime;
-
-        startTime = MediaCodecHelper.getMonotonicMillis();
-
-        index = videoDecoder.dequeueInputBuffer(wait ? (infiniteWait ? -1 : 3000) : 0);
-        if (index < 0) {
-            return index;
-        }
-
-        queueTime = MediaCodecHelper.getMonotonicMillis();
-
-        if (queueTime - startTime >= 20) {
-            LimeLog.warning("Queue input buffer ran long: " + (queueTime - startTime) + " ms");
-        }
-
-        return index;
-    }
-
-    private void startLegacyRendererThread()
-    {
-        rendererThread = new Thread() {
-            @Override
-            public void run() {
-                BufferInfo info = new BufferInfo();
-                DecodeUnit du = null;
-                int inputIndex = -1;
-                long lastDuDequeueTime = 0;
-                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 = dequeueInputBuffer(false, false);
-                                du = depacketizer.pollNextDecodeUnit();
-                                if (du != null) {
-                                    lastDuDequeueTime = MediaCodecHelper.getMonotonicMillis();
-                                    notifyDuReceived(du);
-                                }
-
-                                // Stop if we can't get a DU or input buffer
-                                if (du == null || inputIndex == -1) {
-                                    break;
-                                }
-
-                                submitDecodeUnit(du, inputIndex);
-
-                                du = null;
-                                inputIndex = -1;
-                            }
-                        } catch (Exception e) {
-                            inputIndex = -1;
-                            handleDecoderException(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 = dequeueInputBuffer(du != null, false);
-                        } catch (Exception e) {
-                            inputIndex = -1;
-                            handleDecoderException(e, null, 0);
-                        }
-                    }
-
-                    // Grab a decode unit if we don't have one already
-                    if (du == null) {
-                        du = depacketizer.pollNextDecodeUnit();
-                        if (du != null) {
-                            lastDuDequeueTime = MediaCodecHelper.getMonotonicMillis();
-                            notifyDuReceived(du);
-                        }
-                    }
-
-                    // 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) {
-                        long submissionTime = MediaCodecHelper.getMonotonicMillis();
-                        if (submissionTime - lastDuDequeueTime >= 20) {
-                            LimeLog.warning("Receiving an input buffer took too long: "+(submissionTime - lastDuDequeueTime)+" ms");
-                        }
-
-                        submitDecodeUnit(du, 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 = MediaCodecHelper.getMonotonicMillis()-(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_FORMAT_CHANGED:
-                                    LimeLog.info("Output format changed");
-                                    LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-                    } catch (Exception e) {
-                        handleDecoderException(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();
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            legacyInputBuffers = videoDecoder.getInputBuffers();
-        }
-
-        if (directSubmit) {
-            startDirectSubmitRendererThread();
-        }
-        else {
-            startLegacyRendererThread();
-        }
-
-        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,
-                        offset, length,
-                        timestampUs, codecFlags);
-                break;
-            } catch (Exception e) {
-                handleDecoderException(e, null, codecFlags);
-                lastException = e;
-            }
-        }
-
-        if (i == 25) {
-            throw new RendererException(this, lastException, null, codecFlags);
-        }
-    }
-
-    // Using the new getInputBuffer() API on Lollipop allows
-    // the framework to do some performance optimizations for us
-    private ByteBuffer getEmptyInputBuffer(int inputBufferIndex) {
-        ByteBuffer buf;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            buf = videoDecoder.getInputBuffer(inputBufferIndex);
-        }
-        else {
-            buf = legacyInputBuffers[inputBufferIndex];
-
-            // Clear old input data pre-Lollipop
-            buf.clear();
-        }
-
-        return buf;
-    }
-
-    private void doProfileSpecificSpsPatching(SeqParameterSet sps) {
-        // Some devices benefit from setting constraint flags 4 & 5 to make this Constrained
-        // High Profile which allows the decoder to assume there will be no B-frames and
-        // reduce delay and buffering accordingly. Some devices (Marvell, Exynos 4) don't
-        // like it so we only set them on devices that are confirmed to benefit from it.
-        if (sps.profile_idc == 100 && constrainedHighProfile) {
-            LimeLog.info("Setting constraint set flags for constrained high profile");
-            sps.constraint_set_4_flag = true;
-            sps.constraint_set_5_flag = true;
-        }
-        else {
-            // Force the constraints unset otherwise (some may be set by default)
-            sps.constraint_set_4_flag = false;
-            sps.constraint_set_5_flag = false;
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private void submitDecodeUnit(DecodeUnit decodeUnit, int inputBufferIndex) {
-        long timestampUs = System.nanoTime() / 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;
-
-        ByteBuffer buf = getEmptyInputBuffer(inputBufferIndex);
-
-        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.getBufferHead();
-
-            // H264 SPS
-            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);
-
-                // The H264Utils.readSPS function safely handles
-                // Annex B NALUs (including NALUs with escape sequences)
-                SeqParameterSet sps = H264Utils.readSPS(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;
-
-                // GFE 2.5.11 changed the SPS to add additional extensions
-                // Some devices don't like these so we remove them here.
-                sps.vuiParams.video_signal_type_present_flag = false;
-                sps.vuiParams.colour_description_present_flag = false;
-                sps.vuiParams.chroma_loc_info_present_flag = false;
-
-                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.
-
-                    // GFE 2.5.11 started sending bitstream restrictions
-                    if (sps.vuiParams.bitstreamRestriction == null) {
-                        LimeLog.info("Adding bitstream restrictions");
-                        sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
-                        sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
-                        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;
-                    }
-                    else {
-                        LimeLog.info("Patching bitstream restrictions");
-                    }
-
-                    // Some devices throw errors if max_dec_frame_buffering < num_ref_frames
-                    sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = sps.num_ref_frames;
-
-                    // These values are the defaults for the fields, but they are more aggressive
-                    // than what GFE sends in 2.5.11, but it doesn't seem to cause picture problems.
-                    sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
-                    sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
-
-                    // log2_max_mv_length_horizontal and log2_max_mv_length_vertical are set to more
-                    // conservative values by GFE 2.5.11. We'll let those values stand.
-                }
-                else {
-                    // Devices that didn't/couldn't get bitstream restrictions before GFE 2.5.11
-                    // will continue to not receive them now
-                    sps.vuiParams.bitstreamRestriction = null;
-                }
-
-                // 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;
-                }
-
-                // Patch the SPS constraint flags
-                doProfileSpecificSpsPatching(sps);
-
-                // Write the annex B header
-                buf.put(header.data, header.offset, 5);
-
-                // The H264Utils.writeSPS function safely handles
-                // Annex B NALUs (including NALUs with escape sequences)
-                ByteBuffer escapedNalu = H264Utils.writeSPS(sps, header.length);
-                buf.put(escapedNalu);
-
-                queueInputBuffer(inputBufferIndex,
-                        0, buf.position(),
-                        timestampUs, codecFlags);
-
-                depacketizer.freeDecodeUnit(decodeUnit);
-                return;
-
-                // H264 PPS
-            } 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;
-                }
-            }
-            else if (header.data[header.offset+4] == 0x40) {
-                numVpsIn++;
-            }
-            else if (header.data[header.offset+4] == 0x42) {
-                numSpsIn++;
-            }
-            else if (header.data[header.offset+4] == 0x44) {
-                numPpsIn++;
-            }
-        }
-
-        // Copy data from our buffer list into the input buffer
-        for (ByteBufferDescriptor desc = decodeUnit.getBufferHead();
-             desc != null; desc = desc.nextDescriptor) {
-            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 = dequeueInputBuffer(true, true);
-        ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex);
-
-        // 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;
-
-        // Patch the SPS constraint flags
-        doProfileSpecificSpsPatching(savedSps);
-
-        // The H264Utils.writeSPS function safely handles
-        // Annex B NALUs (including NALUs with escape sequences)
-        ByteBuffer escapedNalu = H264Utils.writeSPS(savedSps, 128);
-        inputBuffer.put(escapedNalu);
-
-        // No need for the SPS anymore
-        savedSps = null;
-
-        // Queue the new SPS
-        queueInputBuffer(inputIndex,
-                0, inputBuffer.position(),
-                System.nanoTime() / 1000,
-                MediaCodec.BUFFER_FLAG_CODEC_CONFIG);
-
-        LimeLog.info("SPS replay complete");
-    }
-
-    @Override
-    public int getCapabilities() {
-        int caps = 0;
-
-        caps |= adaptivePlayback ?
-                VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION : 0;
-
-        caps |= directSubmit ?
-                VideoDecoderRenderer.CAPABILITY_DIRECT_SUBMIT : 0;
-
-        return caps;
-    }
-
-    @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);
-    }
-
-    private void notifyDuReceived(DecodeUnit du) {
-        long currentTime = MediaCodecHelper.getMonotonicMillis();
-        long delta = currentTime-du.getReceiveTimestamp();
-        if (delta >= 0 && delta < 1000) {
-            totalTimeMs += currentTime-du.getReceiveTimestamp();
-            totalFrames++;
-        }
-    }
-
-    @Override
-    public void directSubmitDecodeUnit(DecodeUnit du) {
-        int inputIndex;
-
-        notifyDuReceived(du);
-
-        for (;;) {
-            try {
-                inputIndex = dequeueInputBuffer(true, true);
-                break;
-            } catch (Exception e) {
-                handleDecoderException(e, null, 0);
-            }
-        }
-
-        if (inputIndex >= 0) {
-            submitDecodeUnit(du, inputIndex);
-        }
-    }
-
-    public class RendererException extends RuntimeException {
-        private static final long serialVersionUID = 8985937536997012406L;
-
-        private final Exception originalException;
-        private final 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 += "Format: "+renderer.videoFormat+"\n";
-            str += "AVC Decoder: "+renderer.avcDecoderName+"\n";
-            str += "HEVC Decoder: "+renderer.hevcDecoderName+"\n";
-            str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
-            str += "In stats: "+renderer.numVpsIn+", "+renderer.numSpsIn+", "+renderer.numPpsIn+", "+renderer.numIframeIn+"\n";
-            str += "Total frames: "+renderer.totalFrames+"\n";
-            str += "Average end-to-end client latency: "+getAverageEndToEndLatency()+"ms\n";
-            str += "Average hardware decoder latency: "+getAverageDecoderLatency()+"ms\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;
-        }
-    }
-}
@@ -1,422 +0,0 @@
-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.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.ConfigurationInfo;
-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 {
-	
-	private static final List<String> preferredDecoders;
-
-	private static final List<String> blacklistedDecoderPrefixes;
-	private static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	private static final List<String> whitelistedAdaptiveResolutionPrefixes;
-    private static final List<String> baselineProfileHackPrefixes;
-    private static final List<String> directSubmitPrefixes;
-	private static final List<String> constrainedHighProfilePrefixes;
-	private static final List<String> whitelistedHevcDecoders;
-
-    static {
-        directSubmitPrefixes = new LinkedList<String>();
-
-        // These decoders have low enough input buffer latency that they
-        // can be directly invoked from the receive thread
-        directSubmitPrefixes.add("omx.qcom");
-        directSubmitPrefixes.add("omx.sec");
-        directSubmitPrefixes.add("omx.exynos");
-        directSubmitPrefixes.add("omx.intel");
-        directSubmitPrefixes.add("omx.brcm");
-        directSubmitPrefixes.add("omx.TI");
-        directSubmitPrefixes.add("omx.arc");
-    }
-
-	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.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");
-
-		constrainedHighProfilePrefixes = new LinkedList<String>();
-		constrainedHighProfilePrefixes.add("omx.intel");
-	}
-
-	static {
-		whitelistedHevcDecoders = new LinkedList<>();
-
-		// Exynos seems to be the only HEVC decoder that works reliably
-		whitelistedHevcDecoders.add("omx.exynos");
-
-		// TODO: This needs a similar fixup to the Tegra 3 otherwise it buffers 16 frames
-		//whitelistedHevcDecoders.add("omx.nvidia");
-
-		// Sony ATVs have broken MediaTek codecs (decoder hangs after rendering the first frame).
-		// I know the Fire TV 2 works, so I'll just whitelist Amazon devices which seem
-		// to actually be tested. Ugh...
-		if (Build.MANUFACTURER.equalsIgnoreCase("Amazon")) {
-			whitelistedHevcDecoders.add("omx.mtk");
-		}
-
-		// These theoretically have good HEVC decoding capabilities (potentially better than
-		// their AVC decoders), but haven't been tested enough
-		//whitelistedHevcDecoders.add("omx.amlogic");
-		//whitelistedHevcDecoders.add("omx.rk");
-
-		// Based on GPU attributes queried at runtime, the omx.qcom prefix will be added
-		// during initialization to avoid SoCs with broken HEVC decoders.
-	}
-
-	public static void initializeWithContext(Context context) {
-		ActivityManager activityManager =
-				(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-		ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
-		if (configInfo.reqGlEsVersion != ConfigurationInfo.GL_ES_VERSION_UNDEFINED) {
-			// Qualcomm's early HEVC decoders break hard on our HEVC stream. The best check to
-			// tell the good from the bad decoders are the generation of Adreno GPU included:
-			// 3xx - bad
-			// 4xx - good
-			//
-			// Unfortunately, it's not that easy to get that information here, so I'll use an
-			// approximation by checking the GLES level (<= 3.0 is bad).
-			LimeLog.info("OpenGL ES version: "+configInfo.reqGlEsVersion);
-			if (configInfo.reqGlEsVersion > 0x30000) {
-				LimeLog.info("Added omx.qcom to supported decoders based on GLES 3.1+ support");
-				whitelistedHevcDecoders.add("omx.qcom");
-			}
-		}
-	}
-
-	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;
-	}
-
-	public static long getMonotonicMillis() {
-		return System.nanoTime() / 1000000L;
-	}
-	
-	@TargetApi(Build.VERSION_CODES.KITKAT)
-	public static boolean decoderSupportsAdaptivePlayback(String decoderName) {
-		/*
-        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 decoderNeedsConstrainedHighProfile(String decoderName) {
-		return isDecoderInList(constrainedHighProfilePrefixes, decoderName);
-	}
-
-    public static boolean decoderCanDirectSubmit(String decoderName) {
-        return isDecoderInList(directSubmitPrefixes, decoderName) && !isExynos4Device();
-    }
-	
-	public static boolean decoderNeedsSpsBitstreamRestrictions(String decoderName) {
-		return isDecoderInList(spsFixupBitstreamFixupDecoderPrefixes, decoderName);
-	}
-
-    public static boolean decoderNeedsBaselineSpsHack(String decoderName) {
-        return isDecoderInList(baselineProfileHackPrefixes, decoderName);
-    }
-
-	public static boolean decoderIsWhitelistedForHevc(String decoderName) {
-		// TODO: Shield Tablet K1/LTE?
-		//
-		// NVIDIA does partial HEVC acceleration on the Shield Tablet. I don't know
-		// whether the performance is good enough to use for streaming, but they're
-		// using the same omx.nvidia.h265.decode name as the Shield TV which has a
-		// fully accelerated HEVC pipeline. AFAIK, the only K1 device with this
-		// partially accelerated HEVC decoder is the Shield Tablet, so I'll
-		// check for it here.
-		//
-		// TODO: Temporarily disabled with NVIDIA HEVC support
-		/*if (Build.DEVICE.equalsIgnoreCase("shieldtablet")) {
-			return false;
-		}*/
-
-		// Google didn't have official support for HEVC (or more importantly, a CTS test) until
-		// Lollipop. I've seen some MediaTek devices on 4.4 crash when attempting to use HEVC,
-		// so I'm restricting HEVC usage to Lollipop and higher.
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-			return false;
-		}
-
-		return isDecoderInList(whitelistedHevcDecoders, 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;
-	}
-	
-	private static MediaCodecInfo findPreferredDecoder() {
-		// This is a different algorithm than the other findXXXDecoder functions,
-		// because we want to evaluate the decoders in our list's order
-		// rather than MediaCodecList's order
-		
-		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(String mimeType) {
-		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 the specified video format
-			for (String mime : codecInfo.getSupportedTypes()) {
-				if (mime.equalsIgnoreCase(mimeType)) {
-					LimeLog.info("First decoder choice is "+codecInfo.getName());
-					return codecInfo;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	public static MediaCodecInfo findProbableSafeDecoder(String mimeType, int requiredProfile) {
-		// 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(mimeType, requiredProfile);
-		} 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(mimeType);
-		}
-	}
-
-	// 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")
-    private static MediaCodecInfo findKnownSafeDecoder(String mimeType, int requiredProfile) 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 the requested video format
-			for (String mime : codecInfo.getSupportedTypes()) {
-				if (mime.equalsIgnoreCase(mimeType)) {
-					LimeLog.info("Examining decoder capabilities of "+codecInfo.getName());
-
-					CodecCapabilities caps = codecInfo.getCapabilitiesForType(mime);
-
-					if (requiredProfile != -1) {
-						for (CodecProfileLevel profile : caps.profileLevels) {
-							if (profile.profile == requiredProfile) {
-								LimeLog.info("Decoder " + codecInfo.getName() + " supports required profile");
-								return codecInfo;
-							}
-						}
-
-						LimeLog.info("Decoder " + codecInfo.getName() + " does NOT support required profile");
-					}
-					else {
-						return codecInfo;
-					}
-				}
-			}
-		}
-		
-		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;
-	}
-}
@@ -1,169 +0,0 @@
-package com.limelight.computers;
-
-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;
-import com.limelight.nvstream.http.ComputerDetails;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-
-public class ComputerDatabaseManager {
-    private static final String COMPUTER_DB_NAME = "computers.db";
-    private static final String COMPUTER_TABLE_NAME = "Computers";
-    private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
-    private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
-    private static final String LOCAL_IP_COLUMN_NAME = "LocalIp";
-    private static final String REMOTE_IP_COLUMN_NAME = "RemoteIp";
-    private static final String MAC_COLUMN_NAME = "Mac";
-
-    private SQLiteDatabase computerDb;
-
-    public ComputerDatabaseManager(Context c) {
-        try {
-            // Create or open an existing DB
-            computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
-        } catch (SQLiteException e) {
-            // Delete the DB and try again
-            c.deleteDatabase(COMPUTER_DB_NAME);
-            computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
-        }
-        initializeDb();
-    }
-
-    public void close() {
-        computerDb.close();
-    }
-
-    private void initializeDb() {
-        // Create tables if they aren't already there
-        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,
-                REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
-    }
-
-    public void deleteComputer(String name) {
-        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_NAME_COLUMN_NAME+"=?", new String[]{name});
-    }
-
-    public boolean updateComputer(ComputerDetails details) {
-        ContentValues values = new ContentValues();
-        values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
-        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
-        values.put(LOCAL_IP_COLUMN_NAME, details.localIp.getAddress());
-        values.put(REMOTE_IP_COLUMN_NAME, details.remoteIp.getAddress());
-        values.put(MAC_COLUMN_NAME, details.macAddress);
-        return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
-    }
-
-    public List<ComputerDetails> getAllComputers() {
-        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
-        LinkedList<ComputerDetails> computerList = new LinkedList<ComputerDetails>();
-        while (c.moveToNext()) {
-            ComputerDetails details = new ComputerDetails();
-
-            details.name = c.getString(0);
-
-            String uuidStr = c.getString(1);
-            try {
-                details.uuid = UUID.fromString(uuidStr);
-            } catch (IllegalArgumentException e) {
-                // We'll delete this entry
-                LimeLog.severe("DB: Corrupted UUID for "+details.name);
-            }
-
-            try {
-                details.localIp = InetAddress.getByAddress(c.getBlob(2));
-            } catch (UnknownHostException e) {
-                // We'll delete this entry
-                LimeLog.severe("DB: Corrupted local IP for "+details.name);
-            }
-
-            try {
-                details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-            } catch (UnknownHostException e) {
-                // We'll delete this entry
-                LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-            }
-
-            details.macAddress = c.getString(4);
-
-            // This signifies we don't have dynamic state (like pair state)
-            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);
-        }
-
-        c.close();
-
-        return computerList;
-    }
-
-    public ComputerDetails getComputerByName(String name) {
-        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_NAME_COLUMN_NAME+"=?", new String[]{name}, null, null, null);
-        ComputerDetails details = new ComputerDetails();
-        if (!c.moveToFirst()) {
-            // No matching computer
-            c.close();
-            return null;
-        }
-
-        details.name = c.getString(0);
-
-        String uuidStr = c.getString(1);
-        try {
-            details.uuid = UUID.fromString(uuidStr);
-        } catch (IllegalArgumentException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted UUID for "+details.name);
-        }
-
-        try {
-            details.localIp = InetAddress.getByAddress(c.getBlob(2));
-        } catch (UnknownHostException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted local IP for "+details.name);
-        }
-
-        try {
-            details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-        } catch (UnknownHostException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-        }
-
-        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 ||
-                details.macAddress == null) {
-            deleteComputer(details.name);
-            return null;
-        }
-
-        return details;
-    }
-}
@@ -1,7 +0,0 @@
-package com.limelight.computers;
-
-import com.limelight.nvstream.http.ComputerDetails;
-
-public interface ComputerManagerListener {
-    public void notifyComputerUpdated(ComputerDetails details);
-}
@@ -1,780 +0,0 @@
-package com.limelight.computers;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-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.NvApp;
-import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.nvstream.mdns.MdnsComputer;
-import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
-import com.limelight.utils.CacheHelper;
-
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Binder;
-import android.os.IBinder;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-public class ComputerManagerService extends Service {
-    private static final int SERVERINFO_POLLING_PERIOD_MS = 1500;
-    private static final int APPLIST_POLLING_PERIOD_MS = 30000;
-    private static final int APPLIST_FAILED_POLLING_RETRY_MS = 2000;
-    private static final int MDNS_QUERY_PERIOD_MS = 1000;
-    private static final int FAST_POLL_TIMEOUT = 500;
-    private static final int OFFLINE_POLL_TRIES = 5;
-
-    private final ComputerManagerBinder binder = new ComputerManagerBinder();
-
-    private ComputerDatabaseManager dbManager;
-    private final AtomicInteger dbRefCount = new AtomicInteger(0);
-
-    private IdentityManager idManager;
-    private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
-    private ComputerManagerListener listener = null;
-    private final 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, int offlineCount) throws InterruptedException {
-        if (!getLocalDatabaseReference()) {
-            return false;
-        }
-
-        activePolls.incrementAndGet();
-
-        // Poll the machine
-        try {
-            if (!pollComputer(details)) {
-                if (!newPc && offlineCount < OFFLINE_POLL_TRIES) {
-                    // Return without calling the listener
-                    releaseLocalDatabaseReference();
-                    return false;
-                }
-
-                details.state = ComputerDetails.State.OFFLINE;
-                details.reachability = ComputerDetails.Reachability.OFFLINE;
-            }
-        } catch (InterruptedException e) {
-            releaseLocalDatabaseReference();
-            throw e;
-        } finally {
-            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 false;
-                }
-            }
-
-            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 PollingTuple tuple) {
-        Thread t = new Thread() {
-            @Override
-            public void run() {
-
-                int offlineCount = 0;
-                while (!isInterrupted() && pollingActive) {
-                    try {
-                        // Only allow one request to the machine at a time
-                        synchronized (tuple.networkLock) {
-                            // Check if this poll has modified the details
-                            if (!runPoll(tuple.computer, false, offlineCount)) {
-                                LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
-                                offlineCount++;
-                            } else {
-                                offlineCount = 0;
-                            }
-                        }
-
-                        // Wait until the next polling interval
-                        Thread.sleep(SERVERINFO_POLLING_PERIOD_MS);
-                    } catch (InterruptedException e) {
-                        break;
-                    }
-                }
-            }
-        };
-        t.setName("Polling thread for " + tuple.computer.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);
-                        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 removeComputer(String name) {
-            ComputerManagerService.this.removeComputer(name);
-        }
-
-        public void stopPolling() {
-            // Just call the unbind handler to cleanup
-            ComputerManagerService.this.onUnbind(null);
-        }
-
-        public ApplistPoller createAppListPoller(ComputerDetails computer) {
-            return new ApplistPoller(computer);
-        }
-
-        public String getUniqueId() {
-            return idManager.getUniqueId();
-        }
-
-        public ComputerDetails getComputer(UUID uuid) {
-            synchronized (pollingTuples) {
-                for (PollingTuple tuple : pollingTuples) {
-                    if (uuid.equals(tuple.computer.uuid)) {
-                        return tuple.computer;
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-
-    @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
-                addComputerBlocking(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();
-            }
-        };
-    }
-
-    private void addTuple(ComputerDetails details) {
-        synchronized (pollingTuples) {
-            for (PollingTuple tuple : pollingTuples) {
-                // Check if this is the same computer
-                if (tuple.computer.uuid.equals(details.uuid)) {
-                    // Update details anyway in case this machine has been re-added by IP
-                    // after not being reachable by our existing information
-                    tuple.computer.localIp = details.localIp;
-                    tuple.computer.remoteIp = details.remoteIp;
-
-                    // Start a polling thread if polling is active
-                    if (pollingActive && tuple.thread == null) {
-                        tuple.thread = createPollingThread(tuple);
-                        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, null);
-            if (pollingActive) {
-                tuple.thread = createPollingThread(tuple);
-            }
-            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;
-
-        // Block while we try to fill the details
-        try {
-            runPoll(fakeDetails, true, 0);
-        } catch (InterruptedException e) {
-            return false;
-        }
-
-        // If the machine is reachable, it was successful
-        if (fakeDetails.state == ComputerDetails.State.ONLINE) {
-            LimeLog.info("New PC ("+fakeDetails.name+") is UUID "+fakeDetails.uuid);
-
-            // Start a polling thread for this machine
-            addTuple(fakeDetails);
-            return true;
-        }
-        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) {
-        // Fast poll this address first to determine if we can connect at the TCP layer
-        if (!fastPollIp(ipAddr)) {
-            return null;
-        }
-
-        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;
-        }
-    }
-
-    // Just try to establish a TCP connection to speculatively detect a running
-    // GFE server
-    private boolean fastPollIp(InetAddress addr) {
-        Socket s = new Socket();
-        try {
-            s.connect(new InetSocketAddress(addr, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
-            s.close();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    private void startFastPollThread(final InetAddress addr, final boolean[] info) {
-        Thread t = new Thread() {
-            @Override
-            public void run() {
-                boolean pollRes = fastPollIp(addr);
-
-                synchronized (info) {
-                    info[0] = true; // Done
-                    info[1] = pollRes; // Polling result
-
-                    info.notify();
-                }
-            }
-        };
-        t.setName("Fast Poll - "+addr.getHostAddress());
-        t.start();
-    }
-
-    private ComputerDetails.Reachability fastPollPc(final InetAddress local, final InetAddress remote) throws InterruptedException {
-        final boolean[] remoteInfo = new boolean[2];
-        final boolean[] localInfo = new boolean[2];
-
-        startFastPollThread(local, localInfo);
-        startFastPollThread(remote, remoteInfo);
-
-        // Check local first
-        synchronized (localInfo) {
-            while (!localInfo[0]) {
-                localInfo.wait(500);
-            }
-
-            if (localInfo[1]) {
-                return ComputerDetails.Reachability.LOCAL;
-            }
-        }
-
-        // Now remote
-        synchronized (remoteInfo) {
-            while (!remoteInfo[0]) {
-                remoteInfo.wait(500);
-            }
-
-            if (remoteInfo[1]) {
-                return ComputerDetails.Reachability.REMOTE;
-            }
-        }
-
-        return ComputerDetails.Reachability.OFFLINE;
-    }
-
-    private ReachabilityTuple pollForReachability(ComputerDetails details) throws InterruptedException {
-        ComputerDetails polledDetails;
-        ComputerDetails.Reachability reachability;
-
-        // If the local address is routable across the Internet,
-        // always consider this PC remote to be conservative
-        if (details.localIp.equals(details.remoteIp)) {
-            reachability = ComputerDetails.Reachability.REMOTE;
-        }
-        else {
-            // Do a TCP-level connection to the HTTP server to see if it's listening
-            LimeLog.info("Starting fast poll for "+details.name+" ("+details.localIp+", "+details.remoteIp+")");
-            reachability = fastPollPc(details.localIp, details.remoteIp);
-            LimeLog.info("Fast poll for "+details.name+" returned "+reachability.toString());
-
-            // If no connection could be established to either IP address, there's nothing we can do
-            if (reachability == ComputerDetails.Reachability.OFFLINE) {
-                return null;
-            }
-        }
-
-        boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL);
-
-        if (localFirst) {
-            polledDetails = tryPollIp(details, details.localIp);
-        }
-        else {
-            polledDetails = tryPollIp(details, details.remoteIp);
-        }
-
-        InetAddress reachableAddr = null;
-        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);
-            }
-
-            if (polledDetails != null) {
-                // The fallback poll worked
-                reachableAddr = !localFirst ? details.localIp : details.remoteIp;
-            }
-        }
-        else if (polledDetails != null) {
-            reachableAddr = localFirst ? details.localIp : details.remoteIp;
-        }
-
-        if (reachableAddr == null) {
-            return null;
-        }
-
-        if (polledDetails.remoteIp.equals(reachableAddr)) {
-            polledDetails.reachability = ComputerDetails.Reachability.REMOTE;
-        }
-        else if (polledDetails.localIp.equals(reachableAddr)) {
-            polledDetails.reachability = ComputerDetails.Reachability.LOCAL;
-        }
-        else {
-            polledDetails.reachability = ComputerDetails.Reachability.UNKNOWN;
-        }
-
-        return new ReachabilityTuple(polledDetails, reachableAddr);
-    }
-
-    private boolean pollComputer(ComputerDetails details) throws InterruptedException {
-        ReachabilityTuple initialReachTuple = pollForReachability(details);
-        if (initialReachTuple == null) {
-            return false;
-        }
-
-        if (initialReachTuple.computer.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            // Neither IP address reported in the serverinfo response was the one we used.
-            // Poll again to see if we can contact this machine on either of its reported addresses.
-            ReachabilityTuple confirmationReachTuple = pollForReachability(initialReachTuple.computer);
-            if (confirmationReachTuple == null) {
-                // Neither of those seem to work, so we'll hold onto the address that did work
-                initialReachTuple.computer.localIp = initialReachTuple.reachableAddress;
-                initialReachTuple.computer.reachability = ComputerDetails.Reachability.LOCAL;
-            }
-            else {
-                // We got it on one of the returned addresses; replace the original reach tuple
-                // with the new one
-                initialReachTuple = confirmationReachTuple;
-            }
-        }
-
-        // Save the old MAC address
-        String savedMacAddress = details.macAddress;
-
-        // If we got here, it's reachable
-        details.update(initialReachTuple.computer);
-
-        // If the new MAC address is empty, restore the old one (workaround for GFE bug)
-        if (details.macAddress.equals("00:00:00:00:00:00") && savedMacAddress != null) {
-            LimeLog.info("MAC address was empty; using existing value: "+savedMacAddress);
-            details.macAddress = savedMacAddress;
-        }
-
-        return true;
-    }
-
-    @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;
-    }
-
-    public class ApplistPoller {
-        private Thread thread;
-        private final ComputerDetails computer;
-        private final Object pollEvent = new Object();
-        private boolean receivedAppList = false;
-
-        public ApplistPoller(ComputerDetails computer) {
-            this.computer = computer;
-        }
-
-        public void pollNow() {
-            synchronized (pollEvent) {
-                pollEvent.notify();
-            }
-        }
-
-        private boolean waitPollingDelay() {
-            try {
-                synchronized (pollEvent) {
-                    if (receivedAppList) {
-                        // If we've already reported an app list successfully,
-                        // wait the full polling period
-                        pollEvent.wait(APPLIST_POLLING_PERIOD_MS);
-                    }
-                    else {
-                        // If we've failed to get an app list so far, retry much earlier
-                        pollEvent.wait(APPLIST_FAILED_POLLING_RETRY_MS);
-                    }
-                }
-            } catch (InterruptedException e) {
-                return false;
-            }
-
-            return thread != null && !thread.isInterrupted();
-        }
-
-        private PollingTuple getPollingTuple(ComputerDetails details) {
-            synchronized (pollingTuples) {
-                for (PollingTuple tuple : pollingTuples) {
-                    if (details.uuid.equals(tuple.computer.uuid)) {
-                        return tuple;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        public void start() {
-            thread = new Thread() {
-                @Override
-                public void run() {
-                    do {
-                        InetAddress selectedAddr;
-
-                        // Can't poll if it's not online
-                        if (computer.state != ComputerDetails.State.ONLINE) {
-                            if (listener != null) {
-                                listener.notifyComputerUpdated(computer);
-                            }
-                            continue;
-                        }
-
-                        // Can't poll if there's no UUID yet
-                        if (computer.uuid == null) {
-                            continue;
-                        }
-
-                        if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-                            selectedAddr = computer.localIp;
-                        }
-                        else {
-                            selectedAddr = computer.remoteIp;
-                        }
-
-                        NvHTTP http = new NvHTTP(selectedAddr, idManager.getUniqueId(),
-                                null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
-
-                        PollingTuple tuple = getPollingTuple(computer);
-
-                        try {
-                            String appList;
-                            if (tuple != null) {
-                                // If we're polling this machine too, grab the network lock
-                                // while doing the app list request to prevent other requests
-                                // from being issued in the meantime.
-                                synchronized (tuple.networkLock) {
-                                    appList = http.getAppListRaw();
-                                }
-                            }
-                            else {
-                                // No polling is happening now, so we just call it directly
-                                appList = http.getAppListRaw();
-                            }
-
-                            List<NvApp> list = NvHTTP.getAppListByReader(new StringReader(appList));
-                            if (appList != null && !appList.isEmpty() && !list.isEmpty()) {
-                                // Open the cache file
-                                OutputStream cacheOut = null;
-                                try {
-                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString());
-                                    CacheHelper.writeStringToOutputStream(cacheOut, appList);
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                } finally {
-                                    try {
-                                        if (cacheOut != null) {
-                                            cacheOut.close();
-                                        }
-                                    } catch (IOException ignored) {}
-                                }
-
-                                // Update the computer
-                                computer.rawAppList = appList;
-                                receivedAppList = true;
-
-                                // Notify that the app list has been updated
-                                // and ensure that the thread is still active
-                                if (listener != null && thread != null) {
-                                    listener.notifyComputerUpdated(computer);
-                                }
-                            }
-                            else {
-                                LimeLog.warning("Empty app list received from "+computer.uuid);
-                            }
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        } catch (XmlPullParserException e) {
-                            e.printStackTrace();
-                        }
-                    } while (waitPollingDelay());
-                }
-            };
-            thread.start();
-        }
-
-        public void stop() {
-            if (thread != null) {
-                thread.interrupt();
-
-                // Don't join here because we might be blocked on network I/O
-
-                thread = null;
-            }
-        }
-    }
-}
-
-class PollingTuple {
-    public Thread thread;
-    public final ComputerDetails computer;
-    public final Object networkLock;
-
-    public PollingTuple(ComputerDetails computer, Thread thread) {
-        this.computer = computer;
-        this.thread = thread;
-        this.networkLock = new Object();
-    }
-}
-
-class ReachabilityTuple {
-    public final InetAddress reachableAddress;
-    public final ComputerDetails computer;
-
-    public ReachabilityTuple(ComputerDetails computer, InetAddress reachableAddress) {
-        this.computer = computer;
-        this.reachableAddress = reachableAddress;
-    }
-}
@@ -1,86 +0,0 @@
-package com.limelight.computers;
-
-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;
-
-import android.content.Context;
-
-public class IdentityManager {
-    private static final String UNIQUE_ID_FILE_NAME = "uniqueid";
-    private static final int UID_SIZE_IN_BYTES = 8;
-
-    private String uniqueId;
-
-    public IdentityManager(Context c) {
-        uniqueId = loadUniqueId(c);
-        if (uniqueId == null) {
-            uniqueId = generateNewUniqueId(c);
-        }
-
-        LimeLog.info("UID is now: "+uniqueId);
-    }
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
-
-    private static String loadUniqueId(Context c) {
-        // 2 Hex digits per byte
-        char[] uid = new char[UID_SIZE_IN_BYTES * 2];
-        InputStreamReader reader = null;
-        LimeLog.info("Reading UID from disk");
-        try {
-            reader = new InputStreamReader(c.openFileInput(UNIQUE_ID_FILE_NAME));
-            if (reader.read(uid) != UID_SIZE_IN_BYTES * 2)
-            {
-                LimeLog.severe("UID file data is truncated");
-                return null;
-            }
-            return new String(uid);
-        } catch (FileNotFoundException e) {
-            LimeLog.info("No UID file found");
-            return null;
-        } catch (IOException e) {
-            LimeLog.severe("Error while reading UID file");
-            e.printStackTrace();
-            return null;
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException ignored) {}
-            }
-        }
-    }
-
-    private static String generateNewUniqueId(Context c) {
-        // Generate a new UID hex string
-        LimeLog.info("Generating new UID");
-        String uidStr = String.format((Locale)null, "%016x", new Random().nextLong());
-
-        OutputStreamWriter writer = null;
-        try {
-            writer = new OutputStreamWriter(c.openFileOutput(UNIQUE_ID_FILE_NAME, 0));
-            writer.write(uidStr);
-            LimeLog.info("UID written to disk");
-        } catch (IOException e) {
-            LimeLog.severe("Error while writing UID file");
-            e.printStackTrace();
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException ignored) {}
-            }
-        }
-
-        // We can return a UID even if I/O fails
-        return uidStr;
-    }
-}
@@ -1,90 +0,0 @@
-package com.limelight.discovery;
-
-import java.util.List;
-
-import com.limelight.nvstream.mdns.MdnsComputer;
-import com.limelight.nvstream.mdns.MdnsDiscoveryAgent;
-import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.MulticastLock;
-import android.os.Binder;
-import android.os.IBinder;
-
-public class DiscoveryService extends Service {
-
-    private MdnsDiscoveryAgent discoveryAgent;
-    private MdnsDiscoveryListener boundListener;
-    private MulticastLock multicastLock;
-
-    public class DiscoveryBinder extends Binder {
-        public void setListener(MdnsDiscoveryListener listener) {
-            boundListener = listener;
-        }
-
-        public void startDiscovery(int queryIntervalMs) {
-            multicastLock.acquire();
-            discoveryAgent.startDiscovery(queryIntervalMs);
-        }
-
-        public void stopDiscovery() {
-            discoveryAgent.stopDiscovery();
-            multicastLock.release();
-        }
-
-        public List<MdnsComputer> getComputerSet() {
-            return discoveryAgent.getComputerSet();
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        multicastLock = wifiMgr.createMulticastLock("Limelight mDNS");
-        multicastLock.setReferenceCounted(false);
-
-        discoveryAgent = new MdnsDiscoveryAgent(new MdnsDiscoveryListener() {
-            @Override
-            public void notifyComputerAdded(MdnsComputer computer) {
-                if (boundListener != null) {
-                    boundListener.notifyComputerAdded(computer);
-                }
-            }
-
-            @Override
-            public void notifyComputerRemoved(MdnsComputer computer) {
-                if (boundListener != null) {
-                    boundListener.notifyComputerRemoved(computer);
-                }
-            }
-
-            @Override
-            public void notifyDiscoveryFailure(Exception e) {
-                if (boundListener != null) {
-                    boundListener.notifyDiscoveryFailure(e);
-                }
-            }
-        });
-    }
-
-    private final DiscoveryBinder binder = new DiscoveryBinder();
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return binder;
-    }
-
-    @Override
-    public boolean onUnbind(Intent intent) {
-        // Stop any discovery session
-        discoveryAgent.stopDiscovery();
-        multicastLock.release();
-
-        // Unbind the listener
-        boundListener = null;
-        return false;
-    }
-}
@@ -1,115 +0,0 @@
-package com.limelight.grid;
-
-import android.app.Activity;
-import android.graphics.BitmapFactory;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.limelight.AppView;
-import com.limelight.LimeLog;
-import com.limelight.R;
-import com.limelight.grid.assets.CachedAppAssetLoader;
-import com.limelight.grid.assets.DiskAssetLoader;
-import com.limelight.grid.assets.MemoryAssetLoader;
-import com.limelight.grid.assets.NetworkAssetLoader;
-import com.limelight.nvstream.http.ComputerDetails;
-
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Collections;
-import java.util.Comparator;
-
-@SuppressWarnings("unchecked")
-public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
-    private static final int ART_WIDTH_PX = 300;
-    private static final int SMALL_WIDTH_DP = 100;
-    private static final int LARGE_WIDTH_DP = 150;
-
-    private final CachedAppAssetLoader loader;
-
-    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
-        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
-
-        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
-        int dp;
-
-        if (small) {
-            dp = SMALL_WIDTH_DP;
-        }
-        else {
-            dp = LARGE_WIDTH_DP;
-        }
-
-        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160.0));
-        if (scalingDivisor < 1.0) {
-            // We don't want to make them bigger before draw-time
-            scalingDivisor = 1.0;
-        }
-        LimeLog.info("Art scaling divisor: " + scalingDivisor);
-
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = (int) scalingDivisor;
-
-        this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
-                new NetworkAssetLoader(context, uniqueId),
-                new MemoryAssetLoader(),
-                new DiskAssetLoader(context.getCacheDir()),
-                BitmapFactory.decodeResource(activity.getResources(),
-                        R.drawable.image_loading, options));
-    }
-
-    public void cancelQueuedOperations() {
-        loader.cancelForegroundLoads();
-        loader.cancelBackgroundLoads();
-        loader.freeCacheMemory();
-    }
-
-    private void sortList() {
-        Collections.sort(itemList, new Comparator<AppView.AppObject>() {
-            @Override
-            public int compare(AppView.AppObject lhs, AppView.AppObject rhs) {
-                return lhs.app.getAppName().compareTo(rhs.app.getAppName());
-            }
-        });
-    }
-
-    public void addApp(AppView.AppObject app) {
-        // Queue a request to fetch this bitmap into cache
-        loader.queueCacheLoad(app.app);
-
-        // Add the app to our sorted list
-        itemList.add(app);
-        sortList();
-    }
-
-    public void removeApp(AppView.AppObject app) {
-        itemList.remove(app);
-    }
-
-    public boolean populateImageView(ImageView imgView, AppView.AppObject obj) {
-        // Let the cached asset loader handle it
-        loader.populateImageView(obj.app, imgView);
-        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;
-    }
-}
@@ -1,82 +0,0 @@
-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 final Context context;
-    protected final int defaultImageRes;
-    protected final int layoutId;
-    protected final ArrayList<T> itemList = new ArrayList<T>();
-    protected final LayoutInflater inflater;
-
-    public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
-        this.context = context;
-        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 (imgView != null) {
-            if (!populateImageView(imgView, itemList.get(i))) {
-                imgView.setImageResource(defaultImageRes);
-            }
-        }
-        if (!populateTextView(txtView, itemList.get(i))) {
-            txtView.setText(itemList.get(i).toString());
-        }
-        if (overlayView != null) {
-            if (!populateOverlayView(overlayView, itemList.get(i))) {
-                overlayView.setVisibility(View.INVISIBLE);
-            }
-            else {
-                overlayView.setVisibility(View.VISIBLE);
-            }
-        }
-
-        return convertView;
-    }
-}
@@ -1,75 +0,0 @@
-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;
-
-import java.util.Collections;
-import java.util.Comparator;
-
-public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
-
-    public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item), R.drawable.computer);
-    }
-
-    public void addComputer(PcView.ComputerObject computer) {
-        itemList.add(computer);
-        sortList();
-    }
-
-    private void sortList() {
-        Collections.sort(itemList, new Comparator<PcView.ComputerObject>() {
-            @Override
-            public int compare(PcView.ComputerObject lhs, PcView.ComputerObject rhs) {
-                return lhs.details.name.compareTo(rhs.details.name);
-            }
-        });
-    }
-
-    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;
-    }
-}
@@ -1,337 +0,0 @@
-package com.limelight.grid.assets;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.widget.ImageView;
-
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvApp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-public class CachedAppAssetLoader {
-    private static final int MAX_CONCURRENT_DISK_LOADS = 3;
-    private static final int MAX_CONCURRENT_NETWORK_LOADS = 3;
-    private static final int MAX_CONCURRENT_CACHE_LOADS = 1;
-
-    private static final int MAX_PENDING_CACHE_LOADS = 100;
-    private static final int MAX_PENDING_NETWORK_LOADS = 40;
-    private static final int MAX_PENDING_DISK_LOADS = 40;
-
-    private final ThreadPoolExecutor cacheExecutor = new ThreadPoolExecutor(
-            MAX_CONCURRENT_CACHE_LOADS, MAX_CONCURRENT_CACHE_LOADS,
-            Long.MAX_VALUE, TimeUnit.DAYS,
-            new LinkedBlockingQueue<Runnable>(MAX_PENDING_CACHE_LOADS),
-            new ThreadPoolExecutor.DiscardOldestPolicy());
-
-    private final ThreadPoolExecutor foregroundExecutor = new ThreadPoolExecutor(
-            MAX_CONCURRENT_DISK_LOADS, MAX_CONCURRENT_DISK_LOADS,
-            Long.MAX_VALUE, TimeUnit.DAYS,
-            new LinkedBlockingQueue<Runnable>(MAX_PENDING_DISK_LOADS),
-            new ThreadPoolExecutor.DiscardOldestPolicy());
-
-    private final ThreadPoolExecutor networkExecutor = new ThreadPoolExecutor(
-            MAX_CONCURRENT_NETWORK_LOADS, MAX_CONCURRENT_NETWORK_LOADS,
-            Long.MAX_VALUE, TimeUnit.DAYS,
-            new LinkedBlockingQueue<Runnable>(MAX_PENDING_NETWORK_LOADS),
-            new ThreadPoolExecutor.DiscardOldestPolicy());
-
-    private final ComputerDetails computer;
-    private final double scalingDivider;
-    private final NetworkAssetLoader networkLoader;
-    private final MemoryAssetLoader memoryLoader;
-    private final DiskAssetLoader diskLoader;
-    private final Bitmap placeholderBitmap;
-
-    public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
-                                NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader, Bitmap placeholderBitmap) {
-        this.computer = computer;
-        this.scalingDivider = scalingDivider;
-        this.networkLoader = networkLoader;
-        this.memoryLoader = memoryLoader;
-        this.diskLoader = diskLoader;
-        this.placeholderBitmap = placeholderBitmap;
-    }
-
-    public void cancelBackgroundLoads() {
-        Runnable r;
-        while ((r = cacheExecutor.getQueue().poll()) != null) {
-            cacheExecutor.remove(r);
-        }
-    }
-
-    public void cancelForegroundLoads() {
-        Runnable r;
-
-        while ((r = foregroundExecutor.getQueue().poll()) != null) {
-            foregroundExecutor.remove(r);
-        }
-
-        while ((r = networkExecutor.getQueue().poll()) != null) {
-            networkExecutor.remove(r);
-        }
-    }
-
-    public void freeCacheMemory() {
-        memoryLoader.clearCache();
-    }
-
-    private Bitmap doNetworkAssetLoad(LoaderTuple tuple, LoaderTask task) {
-        // Try 3 times
-        for (int i = 0; i < 3; i++) {
-            // Check again whether we've been cancelled or the image view is gone
-            if (task != null && (task.isCancelled() || task.imageViewRef.get() == null)) {
-                return null;
-            }
-
-            InputStream in = networkLoader.getBitmapStream(tuple);
-            if (in != null) {
-                // Write the stream straight to disk
-                diskLoader.populateCacheWithStream(tuple, in);
-
-                // Close the network input stream
-                try {
-                    in.close();
-                } catch (IOException ignored) {}
-
-                // If there's a task associated with this load, we should return the bitmap
-                if (task != null) {
-                    // If the cached bitmap is valid, return it. Otherwise, we'll try the load again
-                    Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
-                    if (bmp != null) {
-                        return bmp;
-                    }
-                }
-                else {
-                    // Otherwise it's a background load and we return nothing
-                    return null;
-                }
-            }
-
-            // Wait 1 second with a bit of fuzz
-            try {
-                Thread.sleep((int) (1000 + (Math.random() * 500)));
-            } catch (InterruptedException e) {
-                return null;
-            }
-        }
-
-        return null;
-    }
-
-    private class LoaderTask extends AsyncTask<LoaderTuple, Void, Bitmap> {
-        private final WeakReference<ImageView> imageViewRef;
-        private final boolean diskOnly;
-
-        private LoaderTuple tuple;
-
-        public LoaderTask(ImageView imageView, boolean diskOnly) {
-            this.imageViewRef = new WeakReference<ImageView>(imageView);
-            this.diskOnly = diskOnly;
-        }
-
-        @Override
-        protected Bitmap doInBackground(LoaderTuple... params) {
-            tuple = params[0];
-
-            // Check whether it has been cancelled or the image view is gone
-            if (isCancelled() || imageViewRef.get() == null) {
-                return null;
-            }
-
-            Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
-            if (bmp == null) {
-                if (!diskOnly) {
-                    // Try to load the asset from the network
-                    bmp = doNetworkAssetLoad(tuple, this);
-                } else {
-                    // Report progress to display the placeholder and spin
-                    // off the network-capable task
-                    publishProgress();
-                }
-            }
-
-            // Cache the bitmap
-            if (bmp != null) {
-                memoryLoader.populateCache(tuple, bmp);
-            }
-
-            return bmp;
-        }
-
-        @Override
-        protected void onProgressUpdate(Void... nothing) {
-            // Do nothing if cancelled
-            if (isCancelled()) {
-                return;
-            }
-
-            // If the current loader task for this view isn't us, do nothing
-            final ImageView imageView = imageViewRef.get();
-            if (getLoaderTask(imageView) == this) {
-                // Set off another loader task on the network executor
-                LoaderTask task = new LoaderTask(imageView, false);
-                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
-                imageView.setAlpha(1.0f);
-                imageView.setImageDrawable(asyncDrawable);
-                task.executeOnExecutor(networkExecutor, tuple);
-            }
-        }
-
-        @Override
-        protected void onPostExecute(Bitmap bitmap) {
-            // Do nothing if cancelled
-            if (isCancelled()) {
-                return;
-            }
-
-            final ImageView imageView = imageViewRef.get();
-            if (getLoaderTask(imageView) == this) {
-                // Set the bitmap
-                if (bitmap != null) {
-                    imageView.setImageBitmap(bitmap);
-                }
-
-                // Show the view
-                imageView.setAlpha(1.0f);
-            }
-        }
-    }
-
-    static class AsyncDrawable extends BitmapDrawable {
-        private final WeakReference<LoaderTask> loaderTaskReference;
-
-        public AsyncDrawable(Resources res, Bitmap bitmap,
-                             LoaderTask loaderTask) {
-            super(res, bitmap);
-            loaderTaskReference = new WeakReference<LoaderTask>(loaderTask);
-        }
-
-        public LoaderTask getLoaderTask() {
-            return loaderTaskReference.get();
-        }
-    }
-
-    private static LoaderTask getLoaderTask(ImageView imageView) {
-        if (imageView == null) {
-            return null;
-        }
-
-        final Drawable drawable = imageView.getDrawable();
-
-        // If our drawable is in play, get the loader task
-        if (drawable instanceof AsyncDrawable) {
-            final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-            return asyncDrawable.getLoaderTask();
-        }
-
-        return null;
-    }
-
-    private static boolean cancelPendingLoad(LoaderTuple tuple, ImageView imageView) {
-        final LoaderTask loaderTask = getLoaderTask(imageView);
-
-        // Check if any task was pending for this image view
-        if (loaderTask != null && !loaderTask.isCancelled()) {
-            final LoaderTuple taskTuple = loaderTask.tuple;
-
-            // Cancel the task if it's not already loading the same data
-            if (taskTuple == null || !taskTuple.equals(tuple)) {
-                loaderTask.cancel(true);
-            } else {
-                // It's already loading what we want
-                return false;
-            }
-        }
-
-        // Allow the load to proceed
-        return true;
-    }
-
-    public void queueCacheLoad(NvApp app) {
-        final LoaderTuple tuple = new LoaderTuple(computer, app);
-
-        if (memoryLoader.loadBitmapFromCache(tuple) != null) {
-            // It's in memory which means it must also be on disk
-            return;
-        }
-
-        // Queue a fetch in the cache executor
-        cacheExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                // Check if the image is cached on disk
-                if (diskLoader.checkCacheExists(tuple)) {
-                    return;
-                }
-
-                // Try to load the asset from the network and cache result on disk
-                doNetworkAssetLoad(tuple, null);
-            }
-        });
-    }
-
-    public void populateImageView(NvApp app, ImageView view) {
-        LoaderTuple tuple = new LoaderTuple(computer, app);
-
-        // If there's already a task in progress for this view,
-        // cancel it. If the task is already loading the same image,
-        // we return and let that load finish.
-        if (!cancelPendingLoad(tuple, view)) {
-            return;
-        }
-
-        // First, try the memory cache in the current context
-        Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
-        if (bmp != null) {
-            // Show the bitmap immediately
-            view.setAlpha(1.0f);
-            view.setImageBitmap(bmp);
-            return;
-        }
-
-        // If it's not in memory, create an async task to load it. This task will be attached
-        // via AsyncDrawable to this view.
-        final LoaderTask task = new LoaderTask(view, true);
-        final AsyncDrawable asyncDrawable = new AsyncDrawable(view.getResources(), placeholderBitmap, task);
-        view.setAlpha(0.0f);
-        view.setImageDrawable(asyncDrawable);
-
-        // Run the task on our foreground executor
-        task.executeOnExecutor(foregroundExecutor, tuple);
-    }
-
-    public class LoaderTuple {
-        public final ComputerDetails computer;
-        public final NvApp app;
-
-        public LoaderTuple(ComputerDetails computer, NvApp app) {
-            this.computer = computer;
-            this.app = app;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof LoaderTuple)) {
-                return false;
-            }
-
-            LoaderTuple other = (LoaderTuple) o;
-            return computer.uuid.equals(other.computer.uuid) && app.getAppId() == other.app.getAppId();
-        }
-
-        @Override
-        public String toString() {
-            return "("+computer.uuid+", "+app.getAppId()+")";
-        }
-    }
-}
@@ -1,83 +0,0 @@
-package com.limelight.grid.assets;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import com.limelight.LimeLog;
-import com.limelight.utils.CacheHelper;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class DiskAssetLoader {
-    // 5 MB
-    private final long MAX_ASSET_SIZE = 5 * 1024 * 1024;
-
-    private final File cacheDir;
-
-    public DiskAssetLoader(File cacheDir) {
-        this.cacheDir = cacheDir;
-    }
-
-    public boolean checkCacheExists(CachedAppAssetLoader.LoaderTuple tuple) {
-        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
-    }
-
-    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
-        InputStream in = null;
-        Bitmap bmp = null;
-        try {
-            // Make sure the cached asset doesn't exceed the maximum size
-            if (CacheHelper.getFileSize(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png") > MAX_ASSET_SIZE) {
-                LimeLog.warning("Removing cached tuple exceeding size threshold: "+tuple);
-                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
-                return null;
-            }
-
-            in = CacheHelper.openCacheFileForInput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
-            BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inSampleSize = sampleSize;
-            options.inPreferredConfig = Bitmap.Config.RGB_565;
-            bmp = BitmapFactory.decodeStream(in, null, options);
-        } catch (IOException ignored) {
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException ignored) {}
-            }
-        }
-
-        if (bmp != null) {
-            LimeLog.info("Disk cache hit for tuple: "+tuple);
-        }
-
-        return bmp;
-    }
-
-    public void populateCacheWithStream(CachedAppAssetLoader.LoaderTuple tuple, InputStream input) {
-        OutputStream out = null;
-        boolean success = false;
-        try {
-            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
-            CacheHelper.writeInputStreamToOutputStream(input, out, MAX_ASSET_SIZE);
-            success = true;
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException ignored) {}
-            }
-
-            if (!success) {
-                LimeLog.warning("Unable to populate cache with tuple: "+tuple);
-                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
-            }
-        }
-    }
-}
@@ -1,37 +0,0 @@
-package com.limelight.grid.assets;
-
-import android.graphics.Bitmap;
-import android.util.LruCache;
-
-import com.limelight.LimeLog;
-
-public class MemoryAssetLoader {
-    private static final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
-    private static final LruCache<String, Bitmap> memoryCache = new LruCache<String, Bitmap>(maxMemory / 16) {
-        @Override
-        protected int sizeOf(String key, Bitmap bitmap) {
-            // Sizeof returns kilobytes
-            return bitmap.getByteCount() / 1024;
-        }
-    };
-
-    private static String constructKey(CachedAppAssetLoader.LoaderTuple tuple) {
-        return tuple.computer.uuid.toString()+"-"+tuple.app.getAppId();
-    }
-
-    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {
-        Bitmap bmp = memoryCache.get(constructKey(tuple));
-        if (bmp != null) {
-            LimeLog.info("Memory cache hit for tuple: "+tuple);
-        }
-        return bmp;
-    }
-
-    public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, Bitmap bitmap) {
-        memoryCache.put(constructKey(tuple), bitmap);
-    }
-
-    public void clearCache() {
-        memoryCache.evictAll();
-    }
-}
@@ -1,49 +0,0 @@
-package com.limelight.grid.assets;
-
-import android.content.Context;
-
-import com.limelight.LimeLog;
-import com.limelight.binding.PlatformBinding;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-
-public class NetworkAssetLoader {
-    private final Context context;
-    private final String uniqueId;
-
-    public NetworkAssetLoader(Context context, String uniqueId) {
-        this.context = context;
-        this.uniqueId = uniqueId;
-    }
-
-    public InputStream getBitmapStream(CachedAppAssetLoader.LoaderTuple tuple) {
-        NvHTTP http = new NvHTTP(getCurrentAddress(tuple.computer), uniqueId, null, PlatformBinding.getCryptoProvider(context));
-
-        InputStream in = null;
-        try {
-            in = http.getBoxArt(tuple.app);
-        } catch (IOException ignored) {}
-
-        if (in != null) {
-            LimeLog.info("Network asset load complete: " + tuple);
-        }
-        else {
-            LimeLog.info("Network asset load failed: " + tuple);
-        }
-
-        return in;
-    }
-
-    private static InetAddress getCurrentAddress(ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-            return computer.localIp;
-        }
-        else {
-            return computer.remoteIp;
-        }
-    }
-}
@@ -1,181 +0,0 @@
-package com.limelight.preferences;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Locale;
-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;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.view.KeyEvent;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class AddComputerManually extends Activity {
-    private TextView hostText;
-    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private final LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
-    private Thread addThread;
-    private final ServiceConnection serviceConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, final IBinder binder) {
-            managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
-            startAddThread();
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            joinAddThread();
-            managerBinder = null;
-        }
-    };
-
-    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 = getResources().getString(R.string.addpc_fail);
-            }
-            else {
-                msg = getResources().getString(R.string.addpc_success);
-                finish = true;
-            }
-        } catch (UnknownHostException e) {
-            msg = getResources().getString(R.string.addpc_unknown_host);
-        }
-
-        dialog.dismiss();
-
-        final boolean toastFinish = finish;
-        final String toastMsg = msg;
-        AddComputerManually.this.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
-
-                if (toastFinish && !isFinishing()) {
-                    // Close the activity
-                    AddComputerManually.this.finish();
-                }
-            }
-        });
-    }
-
-    private void startAddThread() {
-        addThread = new Thread() {
-            @Override
-            public void run() {
-                while (!isInterrupted()) {
-                    String computer;
-
-                    try {
-                        computer = computersToAdd.take();
-                    } catch (InterruptedException e) {
-                        return;
-                    }
-
-                    doAddPc(computer);
-                }
-            }
-        };
-        addThread.setName("UI - AddComputerManually");
-        addThread.start();
-    }
-
-    private void joinAddThread() {
-        if (addThread != null) {
-            addThread.interrupt();
-
-            try {
-                addThread.join();
-            } catch (InterruptedException ignored) {}
-
-            addThread = null;
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        Dialog.closeDialogs();
-        SpinnerDialog.closeDialogs(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (managerBinder != null) {
-            joinAddThread();
-            unbindService(serviceConnection);
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
-
-        setContentView(R.layout.activity_add_computer_manually);
-
-        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().trim());
-                }
-                else if (actionId == EditorInfo.IME_ACTION_PREVIOUS) {
-                    // This is how the Fire TV dismisses the keyboard
-                    InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(hostText.getWindowToken(), 0);
-                    return false;
-                }
-
-                return false;
-            }
-        });
-
-        // Bind to the ComputerManager service
-        bindService(new Intent(AddComputerManually.this,
-                    ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
-    }
-}
@@ -1,193 +0,0 @@
-package com.limelight.preferences;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.preference.PreferenceManager;
-
-public class PreferenceConfiguration {
-    static final String RES_FPS_PREF_STRING = "list_resolution_fps";
-    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 String LANGUAGE_PREF_STRING = "list_languages";
-    private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
-    private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
-    private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
-    private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
-    private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
-    private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
-    private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_onscreen_controller";
-
-    private static final 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 int BITRATE_DEFAULT_4K_30 = 40;
-    private static final int BITRATE_DEFAULT_4K_60 = 80;
-
-    private static final String DEFAULT_RES_FPS = "720p60";
-    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 String DEFAULT_LANGUAGE = "default";
-    private static final boolean DEFAULT_LIST_MODE = false;
-    private static final boolean DEFAULT_MULTI_CONTROLLER = true;
-    private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
-    private static final boolean DEFAULT_USB_DRIVER = true;
-    private static final String DEFAULT_VIDEO_FORMAT = "auto";
-    private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
-
-    public static final int FORCE_H265_ON = -1;
-    public static final int AUTOSELECT_H265 = 0;
-    public static final int FORCE_H265_OFF = 1;
-
-    public int width, height, fps;
-    public int bitrate;
-    public int videoFormat;
-    public int deadzonePercentage;
-    public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
-    public String language;
-    public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
-    public boolean onscreenController;
-
-    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 if (resFpsString.equals("4K30")) {
-            return BITRATE_DEFAULT_4K_30;
-        }
-        else if (resFpsString.equals("4K60")) {
-            return BITRATE_DEFAULT_4K_60;
-        }
-        else {
-            // Should never get here
-            return DEFAULT_BITRATE;
-        }
-    }
-
-    public static boolean getDefaultSmallMode(Context context) {
-        PackageManager manager = context.getPackageManager();
-        if (manager != null) {
-            // TVs shouldn't use small mode by default
-            if (manager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
-                return false;
-            }
-
-            // API 21 uses LEANBACK instead of TELEVISION
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                if (manager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
-                    return false;
-                }
-            }
-        }
-
-        // Use small mode on anything smaller than a 7" tablet
-        return context.getResources().getConfiguration().smallestScreenWidthDp < 600;
-    }
-
-    public static int getDefaultBitrate(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return getDefaultBitrate(prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS));
-    }
-
-    private static int getVideoFormatValue(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        String str = prefs.getString(VIDEO_FORMAT_PREF_STRING, DEFAULT_VIDEO_FORMAT);
-        if (str.equals("auto")) {
-            return AUTOSELECT_H265;
-        }
-        else if (str.equals("forceh265")) {
-            return FORCE_H265_ON;
-        }
-        else if (str.equals("neverh265")) {
-            return FORCE_H265_OFF;
-        }
-        else {
-            // Should never get here
-            return AUTOSELECT_H265;
-        }
-    }
-
-    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 if (str.equals("4K30")) {
-            config.width = 3840;
-            config.height = 2160;
-            config.fps = 30;
-        }
-        else if (str.equals("4K60")) {
-            config.width = 3840;
-            config.height = 2160;
-            config.fps = 60;
-        }
-        else {
-            // Should never get here
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 60;
-        }
-
-        config.videoFormat = getVideoFormatValue(context);
-
-        config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
-
-        config.language = prefs.getString(LANGUAGE_PREF_STRING, DEFAULT_LANGUAGE);
-
-        // 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);
-        config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
-        config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
-        config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
-        config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
-        config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
-        config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
-
-        return config;
-    }
-}
@@ -1,162 +0,0 @@
-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 final Context context;
-
-    private final String dialogMessage;
-    private final String suffix;
-    private final int defaultValue;
-    private final int maxValue;
-    private final int minValue;
-    private int currentValue;
-
-    public SeekBarPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        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 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();
-            }
-        });
-    }
-}
@@ -1,21 +0,0 @@
-package com.limelight.preferences;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.preference.CheckBoxPreference;
-import android.util.AttributeSet;
-
-public class SmallIconCheckboxPreference extends CheckBoxPreference {
-    public SmallIconCheckboxPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public SmallIconCheckboxPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected Object onGetDefaultValue(TypedArray a, int index) {
-        return PreferenceConfiguration.getDefaultSmallMode(getContext());
-    }
-}
@@ -1,85 +0,0 @@
-package com.limelight.preferences;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.app.Activity;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-
-import com.limelight.PcView;
-import com.limelight.R;
-import com.limelight.utils.UiHelper;
-
-import java.util.Locale;
-
-public class StreamSettings extends Activity {
-    private PreferenceConfiguration previousPrefs;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        previousPrefs = PreferenceConfiguration.readPreferences(this);
-
-        if (!previousPrefs.language.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(previousPrefs.language);
-            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-        }
-
-        setContentView(R.layout.activity_stream_settings);
-        getFragmentManager().beginTransaction().replace(
-                R.id.stream_settings, new SettingsFragment()
-        ).commit();
-
-        UiHelper.notifyNewRootView(this);
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-
-        // Check for changes that require a UI reload to take effect
-        PreferenceConfiguration newPrefs = PreferenceConfiguration.readPreferences(this);
-        if (newPrefs.listMode != previousPrefs.listMode ||
-                newPrefs.smallIconMode != previousPrefs.smallIconMode ||
-                !newPrefs.language.equals(previousPrefs.language)) {
-            // Restart the PC view to apply UI changes
-            Intent intent = new Intent(this, PcView.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent, null);
-        }
-    }
-
-    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;
-                }
-            });
-        }
-    }
-}
@@ -1,35 +0,0 @@
-package com.limelight.ui;
-
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-
-import com.limelight.R;
-
-public class AdapterFragment extends Fragment {
-    private AdapterFragmentCallbacks callbacks;
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-
-        callbacks = (AdapterFragmentCallbacks) activity;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        return inflater.inflate(callbacks.getAdapterFragmentLayoutId(), container, false);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        callbacks.receiveAbsListView((AbsListView) getView().findViewById(R.id.fragmentView));
-    }
-}
@@ -1,8 +0,0 @@
-package com.limelight.ui;
-
-import android.widget.AbsListView;
-
-public interface AdapterFragmentCallbacks {
-    public int getAdapterFragmentLayoutId();
-    public void receiveAbsListView(AbsListView gridView);
-}
@@ -1,5 +0,0 @@
-package com.limelight.ui;
-
-public interface GameGestures {
-    public void showKeyboard();
-}
@@ -1,86 +0,0 @@
-package com.limelight.utils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-
-public class CacheHelper {
-    private static File openPath(boolean createPath, File root, String... path) {
-        File f = root;
-        for (int i = 0; i < path.length; i++) {
-            String component = path[i];
-
-            if (i == path.length - 1) {
-                // This is the file component so now we create parent directories
-                if (createPath) {
-                    f.mkdirs();
-                }
-            }
-
-            f = new File(f, component);
-        }
-        return f;
-    }
-
-    public static long getFileSize(File root, String... path) {
-        return openPath(false, root, path).length();
-    }
-
-    public static boolean deleteCacheFile(File root, String... path) {
-        return openPath(false, root, path).delete();
-    }
-
-    public static boolean cacheFileExists(File root, String... path) {
-        return openPath(false, root, path).exists();
-    }
-
-    public static InputStream openCacheFileForInput(File root, String... path) throws FileNotFoundException {
-        return new BufferedInputStream(new FileInputStream(openPath(false, root, path)));
-    }
-
-    public static OutputStream openCacheFileForOutput(File root, String... path) throws FileNotFoundException {
-        return new BufferedOutputStream(new FileOutputStream(openPath(true, root, path)));
-    }
-
-    public static void writeInputStreamToOutputStream(InputStream in, OutputStream out, long maxLength) throws IOException {
-        byte[] buf = new byte[4096];
-        int bytesRead;
-
-        while ((bytesRead = in.read(buf)) != -1) {
-            maxLength -= bytesRead;
-            if (maxLength <= 0) {
-                throw new IOException("Stream exceeded max size");
-            }
-            out.write(buf, 0, bytesRead);
-        }
-    }
-
-    public static String readInputStreamToString(InputStream in) throws IOException {
-        Reader r = new InputStreamReader(in);
-
-        StringBuilder sb = new StringBuilder();
-        char[] buf = new char[256];
-        int bytesRead;
-        while ((bytesRead = r.read(buf)) != -1) {
-            sb.append(buf, 0, bytesRead);
-        }
-
-        try {
-            in.close();
-        } catch (IOException ignored) {}
-
-        return sb.toString();
-    }
-
-    public static void writeStringToOutputStream(OutputStream out, String str) throws IOException {
-        out.write(str.getBytes("UTF-8"));
-    }
-}
@@ -1,77 +0,0 @@
-package com.limelight.utils;
-
-import java.util.ArrayList;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-
-public class Dialog implements Runnable {
-    private final String title;
-    private final String message;
-    private final Activity activity;
-    private final boolean endAfterDismiss;
-
-    private AlertDialog alert;
-
-    private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
-
-    private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
-    {
-        this.activity = activity;
-        this.title = title;
-        this.message = message;
-        this.endAfterDismiss = endAfterDismiss;
-    }
-
-    public static void closeDialogs()
-    {
-        synchronized (rundownDialogs) {
-            for (Dialog d : rundownDialogs) {
-                if (d.alert.isShowing()) {
-                    d.alert.dismiss();
-                }
-            }
-
-            rundownDialogs.clear();
-        }
-    }
-
-    public static void displayDialog(Activity activity, String title, String message, boolean endAfterDismiss)
-    {
-        activity.runOnUiThread(new Dialog(activity, title, message, endAfterDismiss));
-    }
-
-    @Override
-    public void run() {
-        // If we're dying, don't bother creating a dialog
-        if (activity.isFinishing())
-            return;
-
-        alert = new AlertDialog.Builder(activity).create();
-
-        alert.setTitle(title);
-        alert.setMessage(message);
-        alert.setCancelable(false);
-        alert.setCanceledOnTouchOutside(false);
- 
-        alert.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", new DialogInterface.OnClickListener() {
-              public void onClick(DialogInterface dialog, int which) {
-                  synchronized (rundownDialogs) {
-                      rundownDialogs.remove(Dialog.this);
-                      alert.dismiss();
-                  }
-
-                  if (endAfterDismiss) {
-                      activity.finish();
-                  }
-              }
-        });
-
-        synchronized (rundownDialogs) {
-            rundownDialogs.add(this);
-            alert.show();
-        }
-    }
-
-}
@@ -1,90 +0,0 @@
-package com.limelight.utils;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.widget.Toast;
-
-import com.limelight.Game;
-import com.limelight.R;
-import com.limelight.binding.PlatformBinding;
-import com.limelight.computers.ComputerManagerService;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.GfeHttpResponseException;
-import com.limelight.nvstream.http.NvApp;
-import com.limelight.nvstream.http.NvHTTP;
-
-import java.io.FileNotFoundException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public class ServerHelper {
-    public static InetAddress getCurrentAddressFromComputer(ComputerDetails computer) {
-        return computer.reachability == ComputerDetails.Reachability.LOCAL ?
-                computer.localIp : computer.remoteIp;
-    }
-
-    public static void doStart(Activity parent, NvApp app, ComputerDetails computer,
-                               ComputerManagerService.ComputerManagerBinder managerBinder) {
-        Intent intent = new Intent(parent, Game.class);
-        intent.putExtra(Game.EXTRA_HOST,
-                computer.reachability == ComputerDetails.Reachability.LOCAL ?
-                        computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress());
-        intent.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
-        intent.putExtra(Game.EXTRA_APP_ID, app.getAppId());
-        intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
-        intent.putExtra(Game.EXTRA_STREAMING_REMOTE,
-                computer.reachability != ComputerDetails.Reachability.LOCAL);
-        parent.startActivity(intent);
-    }
-
-    public static void doQuit(final Activity parent,
-                              final InetAddress address,
-                              final NvApp app,
-                              final ComputerManagerService.ComputerManagerBinder managerBinder,
-                              final Runnable onComplete) {
-        Toast.makeText(parent, parent.getResources().getString(R.string.applist_quit_app) + " " + app.getAppName() + "...", Toast.LENGTH_SHORT).show();
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                NvHTTP httpConn;
-                String message;
-                try {
-                    httpConn = new NvHTTP(address,
-                            managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(parent));
-                    if (httpConn.quitApp()) {
-                        message = parent.getResources().getString(R.string.applist_quit_success) + " " + app.getAppName();
-                    } else {
-                        message = parent.getResources().getString(R.string.applist_quit_fail) + " " + app.getAppName();
-                    }
-                } catch (GfeHttpResponseException e) {
-                    if (e.getErrorCode() == 599) {
-                        message = "This session wasn't started by this device," +
-                                " so it cannot be quit. End streaming on the original " +
-                                "device or the PC itself. (Error code: "+e.getErrorCode()+")";
-                    }
-                    else {
-                        message = e.getMessage();
-                    }
-                } catch (UnknownHostException e) {
-                    message = parent.getResources().getString(R.string.error_unknown_host);
-                } catch (FileNotFoundException e) {
-                    message = parent.getResources().getString(R.string.error_404);
-                } catch (Exception e) {
-                    message = e.getMessage();
-                } finally {
-                    if (onComplete != null) {
-                        onComplete.run();
-                    }
-                }
-
-                final String toastMessage = message;
-                parent.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(parent, toastMessage, Toast.LENGTH_LONG).show();
-                    }
-                });
-            }
-        }).start();
-    }
-}
@@ -1,120 +0,0 @@
-package com.limelight.utils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-
-public class SpinnerDialog implements Runnable,OnCancelListener {
-    private final String title;
-    private final String message;
-    private final Activity activity;
-    private ProgressDialog progress;
-    private final boolean finish;
-
-    private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
-
-    private SpinnerDialog(Activity activity, String title, String message, boolean finish)
-    {
-        this.activity = activity;
-        this.title = title;
-        this.message = message;
-        this.progress = null;
-        this.finish = finish;
-    }
-
-    public static SpinnerDialog displayDialog(Activity activity, String title, String message, boolean finish)
-    {
-        SpinnerDialog spinner = new SpinnerDialog(activity, title, message, finish);
-        activity.runOnUiThread(spinner);
-        return spinner;
-    }
-
-    public static void closeDialogs(Activity activity)
-    {
-        synchronized (rundownDialogs) {
-            Iterator<SpinnerDialog> i = rundownDialogs.iterator();
-            while (i.hasNext()) {
-                SpinnerDialog dialog = i.next();
-                if (dialog.activity == activity) {
-                    i.remove();
-                    if (dialog.progress.isShowing()) {
-                        dialog.progress.dismiss();
-                    }
-                }
-            }
-        }
-    }
-
-    public void dismiss()
-    {
-        // Running again with progress != null will destroy it
-        activity.runOnUiThread(this);
-    }
-
-    public void setMessage(final String message)
-    {
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                progress.setMessage(message);
-            }
-        });
-    }
-
-    @Override
-    public void run() {
-
-        // If we're dying, don't bother doing anything
-        if (activity.isFinishing()) {
-            return;
-        }
-
-        if (progress == null)
-        {
-            progress = new ProgressDialog(activity);
-
-            progress.setTitle(title);
-            progress.setMessage(message);
-            progress.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-            progress.setOnCancelListener(this);
-
-            // If we want to finish the activity when this is killed, make it cancellable
-            if (finish)
-            {
-                progress.setCancelable(true);
-                progress.setCanceledOnTouchOutside(false);
-            }
-            else
-            {
-                progress.setCancelable(false);
-            }
-
-            synchronized (rundownDialogs) {
-                rundownDialogs.add(this);
-                progress.show();
-            }
-        }
-        else
-        {
-            synchronized (rundownDialogs) {
-                if (rundownDialogs.remove(this) && progress.isShowing()) {
-                    progress.dismiss();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        synchronized (rundownDialogs) {
-            rundownDialogs.remove(this);
-        }
-
-        // This will only be called if finish was true, so we don't need to check again
-        activity.finish();
-    }
-}
@@ -1,62 +0,0 @@
-package com.limelight.utils;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.UiModeManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Configuration;
-import android.view.View;
-
-import com.limelight.R;
-
-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);
-        }
-    }
-
-    public static void displayQuitConfirmationDialog(Activity parent, final Runnable onYes, final Runnable onNo) {
-        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                switch (which){
-                    case DialogInterface.BUTTON_POSITIVE:
-                        if (onYes != null) {
-                            onYes.run();
-                        }
-                        break;
-
-                    case DialogInterface.BUTTON_NEGATIVE:
-                        if (onNo != null) {
-                            onNo.run();
-                        }
-                        break;
-                }
-            }
-        };
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(parent);
-        builder.setMessage(parent.getResources().getString(R.string.applist_quit_confirmation))
-                .setPositiveButton(parent.getResources().getString(R.string.yes), dialogClickListener)
-                .setNegativeButton(parent.getResources().getString(R.string.no), dialogClickListener)
-                .show();
-    }
-}
@@ -1,32 +0,0 @@
-# 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
-
-
-# This next portion of the makefile is mostly copied from build-executable.mk but
-# creates a binary with the libXXX.so form so the APK will install and drop
-# the binary correctly.
-
-LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
-LOCAL_MAKEFILE     := $(local-makefile)
-
-$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
-$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-$(call check-LOCAL_MODULE_FILENAME)
-
-# we are building target objects
-my := TARGET_
-
-$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
-$(call handle-module-built)
-
-LOCAL_MODULE_CLASS := EXECUTABLE
-include $(BUILD_SYSTEM)/build-module.mk
@@ -1,410 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <linux/input.h>
-#include <unistd.h>
-#include <poll.h>
-#include <errno.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-#include <android/log.h>
-
-#define EVDEV_MAX_EVENT_SIZE 24
-
-#define REL_X 0x00
-#define REL_Y 0x01
-#define KEY_Q 16
-#define BTN_LEFT 0x110
-#define BTN_GAMEPAD 0x130
-
-struct DeviceEntry {
-    struct DeviceEntry *next;
-    pthread_t thread;
-    int fd;
-    char devName[128];
-};
-
-static struct DeviceEntry *DeviceListHead;
-static int grabbing = 1;
-static pthread_mutex_t DeviceListLock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t SocketSendLock = PTHREAD_MUTEX_INITIALIZER;
-static int sock;
-
-// This is a small executable that runs in a root shell. It reads input
-// devices and writes the evdev output packets to a socket. This allows
-// Moonlight to read input devices without having to muck with changing
-// device permissions or modifying SELinux policy (which is prevented in
-// Marshmallow anyway).
-
-#define test_bit(bit, array)    (array[bit/8] & (1<<(bit%8)))
-
-static int hasRelAxis(int fd, short axis) {
-    unsigned char relBitmask[(REL_MAX + 1) / 8];
-
-    ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relBitmask)), relBitmask);
-
-    return test_bit(axis, relBitmask);
-}
-
-static int hasKey(int fd, short key) {
-    unsigned char keyBitmask[(KEY_MAX + 1) / 8];
-
-    ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keyBitmask)), keyBitmask);
-
-    return test_bit(key, keyBitmask);
-}
-
-static void outputEvdevData(char *data, int dataSize) {
-    char packetBuffer[EVDEV_MAX_EVENT_SIZE + sizeof(dataSize)];
-
-    // Copy the full packet into our buffer
-    memcpy(packetBuffer, &dataSize, sizeof(dataSize));
-    memcpy(&packetBuffer[sizeof(dataSize)], data, dataSize);
-
-    // Lock to prevent other threads from sending at the same time
-    pthread_mutex_lock(&SocketSendLock);
-    send(sock, packetBuffer, dataSize + sizeof(dataSize), 0);
-    pthread_mutex_unlock(&SocketSendLock);
-}
-
-void* pollThreadFunc(void* context) {
-    struct DeviceEntry *device = context;
-    struct pollfd pollinfo;
-    int pollres, ret;
-    char data[EVDEV_MAX_EVENT_SIZE];
-
-    __android_log_print(ANDROID_LOG_INFO, "EvdevReader", "Polling /dev/input/%s", device->devName);
-
-    if (grabbing) {
-        // Exclusively grab the input device (required to make the Android cursor disappear)
-        if (ioctl(device->fd, EVIOCGRAB, 1) < 0) {
-            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                                "EVIOCGRAB failed for %s: %d", device->devName, errno);
-            goto cleanup;
-        }
-    }
-
-    for (;;) {
-        do {
-            // Unwait every 250 ms to return to caller if the fd is closed
-            pollinfo.fd = device->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(device->fd, data, EVDEV_MAX_EVENT_SIZE);
-            if (ret < 0) {
-                __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                                    "read() failed: %d", errno);
-                goto cleanup;
-            }
-            else if (ret == 0) {
-                __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                                    "read() graceful EOF");
-                goto cleanup;
-            }
-            else if (grabbing) {
-                // Write out the data to our client
-                outputEvdevData(data, ret);
-            }
-        }
-        else {
-            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);
-            }
-
-            // Terminate this thread
-            goto cleanup;
-        }
-    }
-
-cleanup:
-    __android_log_print(ANDROID_LOG_INFO, "EvdevReader", "Closing /dev/input/%s", device->devName);
-
-    // Remove the context from the linked list
-    {
-        struct DeviceEntry *lastEntry;
-
-        // Lock the device list
-        pthread_mutex_lock(&DeviceListLock);
-
-        if (DeviceListHead == device) {
-            DeviceListHead = device->next;
-        }
-        else {
-            lastEntry = DeviceListHead;
-            while (lastEntry->next != NULL) {
-                if (lastEntry->next == device) {
-                    lastEntry->next = device->next;
-                    break;
-                }
-
-                lastEntry = lastEntry->next;
-            }
-        }
-
-        // Unlock device list
-        pthread_mutex_unlock(&DeviceListLock);
-    }
-
-    // Free the context
-    ioctl(device->fd, EVIOCGRAB, 0);
-    close(device->fd);
-    free(device);
-
-    return NULL;
-}
-
-static int precheckDeviceForPolling(int fd) {
-    int isMouse;
-    int isKeyboard;
-    int isGamepad;
-
-    // This is the same check that Android does in EventHub.cpp
-    isMouse = hasRelAxis(fd, REL_X) &&
-           hasRelAxis(fd, REL_Y) &&
-           hasKey(fd, BTN_LEFT);
-
-    // This is the same check that Android does in EventHub.cpp
-    isKeyboard = hasKey(fd, KEY_Q);
-
-    isGamepad = hasKey(fd, BTN_GAMEPAD);
-
-    // We only handle keyboards and mice that aren't gamepads
-    return (isMouse || isKeyboard) && !isGamepad;
-}
-
-static void startPollForDevice(char* deviceName) {
-    struct DeviceEntry *currentEntry;
-    char fullPath[256];
-    int fd;
-
-    // Lock the device list
-    pthread_mutex_lock(&DeviceListLock);
-
-    // Check if the device is already being polled
-    currentEntry = DeviceListHead;
-    while (currentEntry != NULL) {
-        if (strcmp(currentEntry->devName, deviceName) == 0) {
-            // Already polling this device
-            goto unlock;
-        }
-
-        currentEntry = currentEntry->next;
-    }
-
-    // Open the device
-    sprintf(fullPath, "/dev/input/%s", deviceName);
-    fd = open(fullPath, O_RDWR);
-    if (fd < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "Couldn't open %s: %d", fullPath, errno);
-        goto unlock;
-    }
-
-    // Allocate a context
-    currentEntry = malloc(sizeof(*currentEntry));
-    if (currentEntry == NULL) {
-        close(fd);
-        goto unlock;
-    }
-
-    // Populate context
-    currentEntry->fd = fd;
-    strcpy(currentEntry->devName, deviceName);
-
-    // Check if we support polling this device
-    if (!precheckDeviceForPolling(fd)) {
-        // Nope, get out
-        free(currentEntry);
-        close(fd);
-        goto unlock;
-    }
-
-    // Start the polling thread
-    if (pthread_create(&currentEntry->thread, NULL, pollThreadFunc, currentEntry) != 0) {
-        free(currentEntry);
-        close(fd);
-        goto unlock;
-    }
-
-    // Queue this onto the device list
-    currentEntry->next = DeviceListHead;
-    DeviceListHead = currentEntry;
-
-unlock:
-    // Unlock and return
-    pthread_mutex_unlock(&DeviceListLock);
-}
-
-static int enumerateDevices(void) {
-    DIR *inputDir;
-    struct dirent *dirEnt;
-
-    inputDir = opendir("/dev/input");
-    if (!inputDir) {
-        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "Couldn't open /dev/input: %d", errno);
-        return -1;
-    }
-
-    // Start polling each device in /dev/input
-    while ((dirEnt = readdir(inputDir)) != NULL) {
-        if (strcmp(dirEnt->d_name, ".") == 0 || strcmp(dirEnt->d_name, "..") == 0) {
-            // Skip these virtual directories
-            continue;
-        }
-
-        if (strstr(dirEnt->d_name, "event") == NULL) {
-            // Skip non-event devices
-            continue;
-        }
-
-        startPollForDevice(dirEnt->d_name);
-    }
-
-    closedir(inputDir);
-    return 0;
-}
-
-static int connectSocket(int port) {
-    struct sockaddr_in saddr;
-    int ret;
-    int val;
-
-    sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if (sock < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "socket() failed: %d", errno);
-        return -1;
-    }
-
-    memset(&saddr, 0, sizeof(saddr));
-    saddr.sin_family = AF_INET;
-    saddr.sin_port = htons(port);
-    saddr.sin_addr.s_addr = inet_addr("127.0.0.1");
-    ret = connect(sock, (struct sockaddr*)&saddr, sizeof(saddr));
-    if (ret < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "connect() failed: %d", errno);
-        return -1;
-    }
-
-    val = 1;
-    ret = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char*)&val, sizeof(val));
-    if (ret < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "setsockopt() failed: %d", errno);
-        // We can continue anyways
-    }
-
-    __android_log_print(ANDROID_LOG_INFO, "EvdevReader", "Connection established to port %d", port);
-
-    return 0;
-}
-
-#define UNGRAB_REQ 1
-#define REGRAB_REQ 2
-
-int main(int argc, char* argv[]) {
-    int ret;
-    int pollres;
-    struct pollfd pollinfo;
-    int port;
-
-    __android_log_print(ANDROID_LOG_INFO, "EvdevReader", "Entered main()");
-
-    port = atoi(argv[1]);
-    __android_log_print(ANDROID_LOG_INFO, "EvdevReader", "Requested port number: %d", port);
-
-    // Connect to the app's socket
-    ret = connectSocket(port);
-    if (ret < 0) {
-        return ret;
-    }
-
-    // Perform initial enumeration
-    ret = enumerateDevices();
-    if (ret < 0) {
-        return ret;
-    }
-
-    // Wait for requests from the client
-    for (;;) {
-        unsigned char requestId;
-
-        do {
-            // Every second we poll again for new devices if
-            // we haven't received any new events
-            pollinfo.fd = sock;
-            pollinfo.events = POLLIN;
-            pollinfo.revents = 0;
-            pollres = poll(&pollinfo, 1, 1000);
-            if (pollres == 0) {
-                // Timeout, re-enumerate devices
-                enumerateDevices();
-            }
-        }
-        while (pollres == 0);
-
-        if (pollres > 0 && (pollinfo.revents & POLLIN)) {
-            // We'll have data available now
-            ret = recv(sock, &requestId, sizeof(requestId), 0);
-            if (ret < sizeof(requestId)) {
-                __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "Short read on socket");
-                return errno;
-            }
-
-            if (requestId != UNGRAB_REQ && requestId != REGRAB_REQ) {
-                __android_log_print(ANDROID_LOG_ERROR, "EvdevReader", "Unknown request");
-                return requestId;
-            }
-
-            {
-                struct DeviceEntry *currentEntry;
-
-                pthread_mutex_lock(&DeviceListLock);
-
-                // Update state for future devices
-                grabbing = (requestId == REGRAB_REQ);
-
-                // Carry out the requested action on each device
-                currentEntry = DeviceListHead;
-                while (currentEntry != NULL) {
-                    ioctl(currentEntry->fd, EVIOCGRAB, grabbing);
-                    currentEntry = currentEntry->next;
-                }
-
-                pthread_mutex_unlock(&DeviceListLock);
-
-                __android_log_print(ANDROID_LOG_INFO, "EvdevReader", "New grab status is: %s",
-                    grabbing ? "enabled" : "disabled");
-            }
-        }
-        else {
-            // Terminate this thread
-            if (pollres < 0) {
-                __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                                    "Socket recv poll() failed: %d", errno);
-            }
-            else {
-                __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                                    "Socket poll unexpected revents: %d", pollinfo.revents);
-            }
-
-            return -1;
-        }
-    }
-}
@@ -1,100 +0,0 @@
-ANDROID_API_TARGET=21
-PARALLEL_JOBS=$(nproc)
-
-rm -r ./android
-mkdir android
-
-function build_one
-{
-PREFIX=$(pwd)/android/$CPU
-SYSROOT=$NDK/platforms/android-$ANDROID_API_TARGET/arch-$SYSROOT_CPU
-TOOLCHAIN_PATH=$NDK/toolchains/$TOOLCHAIN_DIR/prebuilt/linux-x86_64
-export PATH=$PATH:$TOOLCHAIN_PATH/bin
-./configure \
-    --build=x86_64-unknown-linux-gnu \
-    --host=$TOOLCHAIN_BIN_PREFIX \
-    --target=$TOOLCHAIN_BIN_PREFIX \
-    CFLAGS="--sysroot=$SYSROOT -O2 $ADDI_CFLAGS" \
-    $ADDI_CONFIGURE_FLAGS
-make clean
-make -j$PARALLEL_JOBS
-mkdir android/$CPU
-cp .libs/libopus.a android/$CPU
-}
-
-function build_mips
-{
-CPU=mips
-SYSROOT_CPU=mips
-TOOLCHAIN_BIN_PREFIX=mipsel-linux-android
-TOOLCHAIN_DIR=mipsel-linux-android-4.9
-ADDI_CFLAGS="-mips32 -mhard-float -EL -mno-dsp"
-ADDI_CONFIGURE_FLAGS="--enable-fixed-point" # fixed point
-build_one
-}
-
-function build_mips64
-{
-CPU=mips64
-SYSROOT_CPU=mips64
-TOOLCHAIN_BIN_PREFIX=mips64el-linux-android
-TOOLCHAIN_DIR=mips64el-linux-android-4.9
-ADDI_CFLAGS="-mips64r6"
-ADDI_CONFIGURE_FLAGS="--enable-fixed-point" # fixed point
-build_one
-}
-
-function build_x86
-{
-CPU=x86
-SYSROOT_CPU=x86
-TOOLCHAIN_BIN_PREFIX=i686-linux-android
-TOOLCHAIN_DIR=x86-4.9
-ADDI_CFLAGS="-march=i686 -mtune=atom -mstackrealign -msse -msse2 -msse3 -mssse3 -mfpmath=sse -m32"
-ADDI_CONFIGURE_FLAGS="" # floating point for SSE optimizations
-build_one
-}
-
-function build_x86_64
-{
-CPU=x86_64
-SYSROOT_CPU=x86_64
-TOOLCHAIN_BIN_PREFIX=x86_64-linux-android
-TOOLCHAIN_DIR=x86_64-4.9
-ADDI_CFLAGS="-msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 -mpopcnt -m64"
-ADDI_CONFIGURE_FLAGS="" # floating point for SSE optimizations
-build_one
-}
-
-function build_armv7
-{
-CPU=arm
-SYSROOT_CPU=arm
-TOOLCHAIN_BIN_PREFIX=arm-linux-androideabi
-TOOLCHAIN_DIR=arm-linux-androideabi-4.9
-ADDI_CFLAGS="-marm -mfpu=vfpv3-d16"
-ADDI_LDFLAGS=""
-ADDI_CONFIGURE_FLAGS="--enable-fixed-point" # fixed point for NEON, EDSP, Media
-build_one
-}
-
-# ARMv8 doesn't currently have assembly in the opus project. We still use fixed point
-# anyway in the hopes that it will be more performant even without assembly.
-function build_armv8
-{
-CPU=aarch64
-SYSROOT_CPU=arm64
-TOOLCHAIN_BIN_PREFIX=aarch64-linux-android
-TOOLCHAIN_DIR=aarch64-linux-android-4.9
-ADDI_CFLAGS=""
-ADDI_LDFLAGS=""
-ADDI_CONFIGURE_FLAGS="--enable-fixed-point"
-build_one
-}
-
-build_mips
-build_mips64
-build_x86
-build_x86_64
-build_armv7
-build_armv8
--- a/Show More
+++ b/Show More