Bump versioncode

.gitignore

@@ -33,3 +33,4 @@ build/
 
 # Compiled JNI libraries folder
 **/jniLibs
+app/.externalNativeBuild/

app/app.iml

@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNonRootDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateNonRootDebugAndroidTestSources</task>
           <task>generateNonRootDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -25,16 +22,26 @@
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
+    <facet type="native-android-gradle" name="Native-Android-Gradle">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/nonRoot/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/nonRoot/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/jnienet/enet" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/jnienet" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/evdev_reader" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni/nv_opus_dec" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/nonRoot/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/nonRoot/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/nonRoot/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/nonRoot/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/nonRoot/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/nonRoot/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/res" type="java-resource" />
@@ -42,71 +49,97 @@
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/nonRoot/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRootDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNonRoot/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <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/ndkBuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="bcprov-jdk15on-1.52" level="project" />
     <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.52" level="project" />

app/build.gradle

@@ -4,24 +4,30 @@ import org.apache.tools.ant.taskdefs.condition.Os
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 25
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
 
-        versionName "4.7"
+        versionName "4.7.3"
-        versionCode = 104
+        versionCode = 108
     }
 
     productFlavors {
         root {
             applicationId "com.limelight.root"
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            }
         }
 
         nonRoot {
             applicationId "com.limelight"
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            }
         }
     }
 
@@ -43,32 +49,10 @@ android {
         exclude 'META-INF/BCKEY.DSA'
     }
 
-    sourceSets.main.jni.srcDirs = []
+    externalNativeBuild {
-
+        ndkBuild {
-    //noinspection GroovyAssignabilityCheck,GroovyAssignabilityCheck
+            path "src/main/jni/Android.mk"
-    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
     }
 }
 

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

@@ -11,12 +11,14 @@ import com.limelight.grid.AppGridAdapter;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.http.PairingManager;
 import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.CacheHelper;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.ServerHelper;
+import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
 
@@ -43,14 +45,16 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 public class AppView extends Activity implements AdapterFragmentCallbacks {
     private AppGridAdapter appGridAdapter;
     private String uuidString;
+    private ShortcutHelper shortcutHelper;
 
     private ComputerDetails computer;
     private ComputerManagerService.ApplistPoller poller;
-    private SpinnerDialog blockingLoadSpinner;
+    private SpinnerDialog blockingLoadSpinner, blockingServerinfoSpinner;
     private String lastRawApplist;
     private int lastRunningAppId;
     private boolean suspendGridUpdates;
     private boolean inForeground;
+    private boolean launchedFromShortcut;
 
     private final static int START_OR_RESUME_ID = 1;
     private final static int QUIT_ID = 2;
@@ -59,6 +63,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
     public final static String NAME_EXTRA = "Name";
     public final static String UUID_EXTRA = "UUID";
+    public final static String SHORTCUT_EXTRA = "Shortcut";
 
     private ComputerManagerService.ComputerManagerBinder managerBinder;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
@@ -90,12 +95,15 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         return;
                     }
 
+                    // Load the app grid with cached data (if possible).
+                    // This must be done _before_ startComputerUpdates()
+                    // so the initial serverinfo response can update the running
+                    // icon.
+                    populateAppGridWithCache();
+
                     // Start updates
                     startComputerUpdates();
 
-                    // Load the app grid with cached data (if possible)
-                    populateAppGridWithCache();
-
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
@@ -132,7 +140,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
         managerBinder.startPolling(new ComputerManagerListener() {
             @Override
-            public void notifyComputerUpdated(ComputerDetails details) {
+            public void notifyComputerUpdated(final ComputerDetails details) {
                 // Do nothing if updates are suspended
                 if (suspendGridUpdates) {
                     return;
@@ -157,6 +165,48 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     return;
                 }
 
+                // Close immediately if the PC is no longer paired
+                if (details.state == ComputerDetails.State.ONLINE && details.pairState != PairingManager.PairState.PAIRED) {
+                    AppView.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            // Disable shortcuts referencing this PC for now
+                            shortcutHelper.disableShortcut(details.uuid.toString(),
+                                    getResources().getString(R.string.scut_not_paired));
+
+                            // Display a toast to the user and quit the activity
+                            Toast.makeText(AppView.this, getResources().getText(R.string.scut_not_paired), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                    return;
+                }
+
+                if (launchedFromShortcut) {
+                    if (details.state == ComputerDetails.State.ONLINE) {
+                        if (blockingServerinfoSpinner != null) {
+                            blockingServerinfoSpinner.dismiss();
+                            blockingServerinfoSpinner = null;
+                        }
+
+                        if (details.runningGameId != 0) {
+                            AppView.this.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    // We have to finish this activity here otherwise we'll get into a loop
+                                    // when the user hits back
+                                    finish();
+
+                                    // When launched from shortcut, resume the running game
+                                    ServerHelper.doStart(AppView.this, new NvApp("app", details.runningGameId), computer, managerBinder);
+                                }
+                            });
+                            return;
+                        }
+                    }
+                }
+
                 // App list is the same or empty
                 if (details.rawAppList == null || details.rawAppList.equals(lastRawApplist)) {
 
@@ -175,6 +225,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
                 try {
                     updateUiWithAppList(NvHTTP.getAppListByReader(new StringReader(details.rawAppList)));
+                    updateUiWithServerinfo(details);
 
                     if (blockingLoadSpinner != null) {
                         blockingLoadSpinner.dismiss();
@@ -208,6 +259,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        shortcutHelper = new ShortcutHelper(this);
+
         String locale = PreferenceConfiguration.readPreferences(this).language;
         if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
             Configuration config = new Configuration(getResources().getConfiguration());
@@ -221,6 +274,15 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
         uuidString = getIntent().getStringExtra(UUID_EXTRA);
 
+        launchedFromShortcut = getIntent().getBooleanExtra(SHORTCUT_EXTRA, false);
+        if (launchedFromShortcut) {
+            // Display blocking loading spinner
+            blockingLoadSpinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.conn_establishing_title),
+                    getResources().getString(R.string.applist_connect_msg), true);
+        }
+
+        shortcutHelper.reportShortcutUsed(uuidString);
+
         String labelText = getResources().getString(R.string.title_applist)+" "+getIntent().getStringExtra(NAME_EXTRA);
         TextView label = (TextView) findViewById(R.id.appListText);
         setTitle(labelText);
@@ -282,27 +344,14 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         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 (lastRunningAppId != 0) {
-        if (runningAppId != -1) {
+            if (lastRunningAppId == selectedApp.app.getAppId()) {
-            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));
             }
@@ -378,19 +427,19 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
 
                     // There can only be one or zero apps running.
-                    if (existingApp.app.getIsRunning() &&
+                    if (existingApp.isRunning &&
                             existingApp.app.getAppId() == details.runningGameId) {
                         // This app was running and still is, so we're done now
                         return;
                     }
                     else if (existingApp.app.getAppId() == details.runningGameId) {
                         // This app wasn't running but now is
-                        existingApp.app.setIsRunning(true);
+                        existingApp.isRunning = true;
                         updated = true;
                     }
-                    else if (existingApp.app.getIsRunning()) {
+                    else if (existingApp.isRunning) {
                         // This app was running but now isn't
-                        existingApp.app.setIsRunning(false);
+                        existingApp.isRunning = false;
                         updated = true;
                     }
                     else {
@@ -420,10 +469,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
                         if (existingApp.app.getAppId() == app.getAppId()) {
                             // Found the app; update its properties
-                            if (existingApp.app.getIsRunning() != app.getIsRunning()) {
-                                existingApp.app.setIsRunning(app.getIsRunning());
-                                updated = true;
-                            }
                             if (!existingApp.app.getAppName().equals(app.getAppName())) {
                                 existingApp.app.setAppName(app.getAppName());
                                 updated = true;
@@ -493,7 +538,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 AppObject app = (AppObject) appGridAdapter.getItem(pos);
 
                 // Only open the context menu if something is running, otherwise start it
-                if (getRunningAppId() != -1) {
+                if (lastRunningAppId != 0) {
                     openContextMenu(arg1);
                 } else {
                     ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
@@ -506,6 +551,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
     public class AppObject {
         public final NvApp app;
+        public boolean isRunning;
 
         public AppObject(NvApp app) {
             if (app == null) {

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

@@ -24,6 +24,7 @@ import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.ServerHelper;
+import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
@@ -52,6 +53,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 public class PcView extends Activity implements AdapterFragmentCallbacks {
     private RelativeLayout noPcFoundLayout;
     private PcGridAdapter pcGridAdapter;
+    private ShortcutHelper shortcutHelper;
     private ComputerManagerService.ComputerManagerBinder managerBinder;
     private boolean freezeUpdates, runningPolling, inForeground;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
@@ -142,6 +144,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        shortcutHelper = new ShortcutHelper(this);
+
         String locale = PreferenceConfiguration.readPreferences(this).language;
         if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
             Configuration config = new Configuration(getResources().getConfiguration());
@@ -334,6 +338,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                         else if (pairState == PairingManager.PairState.FAILED) {
                             message = getResources().getString(R.string.pair_fail);
                         }
+                        else if (pairState == PairingManager.PairState.ALREADY_IN_PROGRESS) {
+                            message = getResources().getString(R.string.pair_already_in_progress);
+                        }
                         else if (pairState == PairingManager.PairState.PAIRED) {
                             // Just navigate to the app view without displaying a toast
                             message = null;
@@ -366,6 +373,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
                         if (toastSuccess) {
                             // Open the app list after a successful pairing attempt
+                            computer.pairState = PairState.PAIRED;
                             doAppList(computer);
                         }
                         else {
@@ -486,6 +494,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             return;
         }
 
+        shortcutHelper.createAppViewShortcut(computer.uuid.toString(), computer);
+
         Intent i = new Intent(this, AppView.class);
         i.putExtra(AppView.NAME_EXTRA, computer.name);
         i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
@@ -558,6 +568,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 
             if (details.equals(computer.details)) {
+                // Disable or delete shortcuts referencing this PC
+                shortcutHelper.disableShortcut(details.uuid.toString(),
+                        getResources().getString(R.string.scut_deleted_pc));
+
                 pcGridAdapter.removeComputer(computer);
                 pcGridAdapter.notifyDataSetChanged();
 

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

@@ -5,6 +5,7 @@ import android.hardware.input.InputManager;
 import android.os.SystemClock;
 import android.util.SparseArray;
 import android.view.InputDevice;
+import android.view.InputEvent;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.widget.Toast;
@@ -415,21 +416,27 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return context;
     }
 
-    private InputDeviceContext getContextForDevice(InputDevice dev) {
+    private InputDeviceContext getContextForEvent(InputEvent event) {
         // Unknown devices use the default context
-        if (dev == null) {
+        if (event.getDeviceId() == 0) {
             return defaultContext;
         }
+        else if (event.getDevice() == null) {
+            // During device removal, sometimes we can get events after the
+            // input device has been destroyed. In this case we'll see a
+            // != 0 device ID but no device attached.
+            return null;
+        }
 
         // Return the existing context if it exists
-        InputDeviceContext context = inputDeviceContexts.get(dev.getId());
+        InputDeviceContext context = inputDeviceContexts.get(event.getDeviceId());
         if (context != null) {
             return context;
         }
 
         // Otherwise create a new context
-        context = createInputDeviceContextForDevice(dev);
+        context = createInputDeviceContextForDevice(event.getDevice());
-        inputDeviceContexts.put(dev.getId(), context);
+        inputDeviceContexts.put(event.getDeviceId(), context);
 
         return context;
     }
@@ -627,6 +634,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 default:
                     // Other buttons are mapped correctly
             }
+
+            // The Xbox button is sent as MENU
+            if (event.getKeyCode() == KeyEvent.KEYCODE_MENU) {
+                return KeyEvent.KEYCODE_BUTTON_MODE;
+            }
         }
 
         if (context.hatXAxis != -1 && context.hatYAxis != -1) {
@@ -642,7 +654,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
         else if (context.hatXAxis == -1 &&
                  context.hatYAxis == -1 &&
-                 context.isXboxController &&
+                 /* FIXME: There's no good way to know for sure if xpad is bound
+                    to this device, so we won't use the name to validate if these
+                    scancodes should be mapped to DPAD
+
+                    context.isXboxController &&
+                  */
                  event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
             // If there's not a proper Xbox controller mapping, we'll translate the raw d-pad
             // scan codes into proper key codes
@@ -732,9 +749,23 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
+            // Android sends an initial 0 value for trigger axes even if the trigger
+            // should be negative when idle. After the first touch, the axes will go back
+            // to normal behavior, so ignore triggersIdleNegative for each trigger until
+            // first touch.
+            if (lt != 0) {
+                context.leftTriggerUsed = true;
+            }
+            if (rt != 0) {
+                context.rightTriggerUsed = true;
+            }
             if (context.triggersIdleNegative) {
-                lt = (lt + 1) / 2;
+                if (context.leftTriggerUsed) {
-                rt = (rt + 1) / 2;
+                    lt = (lt + 1) / 2;
+                }
+                if (context.rightTriggerUsed) {
+                    rt = (rt + 1) / 2;
+                }
             }
 
             if (lt <= context.triggerDeadzone) {
@@ -770,7 +801,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     public boolean handleMotionEvent(MotionEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
+        InputDeviceContext context = getContextForEvent(event);
+        if (context == null) {
+            return true;
+        }
+
         float lsX = 0, lsY = 0, rsX = 0, rsY = 0, rt = 0, lt = 0, hatX = 0, hatY = 0;
 
         // We purposefully ignore the historical values in the motion event as it makes
@@ -842,7 +877,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     public boolean handleButtonUp(KeyEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
+        InputDeviceContext context = getContextForEvent(event);
+        if (context == null) {
+            return true;
+        }
 
         int keyCode = handleRemapping(context, event);
         if (keyCode == 0) {
@@ -867,7 +905,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
         case KeyEvent.KEYCODE_MENU:
-            if (SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS) {
+            // Sometimes we'll get a spurious key up event on controller disconnect.
+            // Make sure it's real by checking that the key is actually down before taking
+            // any action.
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
+                SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS) {
                 toggleMouseEmulation(context);
             }
             context.inputMap &= ~ControllerPacket.PLAY_FLAG;
@@ -965,7 +1007,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     public boolean handleButtonDown(KeyEvent event) {
-        InputDeviceContext context = getContextForDevice(event.getDevice());
+        InputDeviceContext context = getContextForEvent(event);
+        if (context == null) {
+            return true;
+        }
 
         int keyCode = handleRemapping(context, event);
         if (keyCode == 0) {
@@ -1153,6 +1198,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public int leftTriggerAxis = -1;
         public int rightTriggerAxis = -1;
         public boolean triggersIdleNegative;
+        public boolean leftTriggerUsed, rightTriggerUsed;
 
         public int hatXAxis = -1;
         public int hatYAxis = -1;

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

@@ -3,6 +3,7 @@ package com.limelight.grid;
 import android.app.Activity;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.limelight.AppView;
@@ -64,7 +65,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         Collections.sort(itemList, new Comparator<AppView.AppObject>() {
             @Override
             public int compare(AppView.AppObject lhs, AppView.AppObject rhs) {
-                return lhs.app.getAppName().compareTo(rhs.app.getAppName());
+                return lhs.app.getAppName().toLowerCase().compareTo(rhs.app.getAppName().toLowerCase());
             }
         });
     }
@@ -82,9 +83,10 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         itemList.remove(app);
     }
 
-    public boolean populateImageView(ImageView imgView, AppView.AppObject obj) {
+    @Override
+    public boolean populateImageView(ImageView imgView, ProgressBar prgView, AppView.AppObject obj) {
         // Let the cached asset loader handle it
-        loader.populateImageView(obj.app, imgView);
+        loader.populateImageView(obj.app, imgView, prgView);
         return true;
     }
 
@@ -99,7 +101,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
 
     @Override
     public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
-        if (obj.app.getIsRunning()) {
+        if (obj.isRunning) {
             // Show the play button overlay
             overlayView.setImageResource(R.drawable.ic_play);
             return true;
@@ -108,9 +110,4 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         // No overlay
         return false;
     }
-
-    @Override
-    public boolean shouldShowProgressBar(AppView.AppObject obj) {
-        return true;
-    }
 }

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

@@ -45,10 +45,9 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
         return i;
     }
 
-    public abstract boolean populateImageView(ImageView imgView, T obj);
+    public abstract boolean populateImageView(ImageView imgView, ProgressBar prgView, T obj);
     public abstract boolean populateTextView(TextView txtView, T obj);
     public abstract boolean populateOverlayView(ImageView overlayView, T obj);
-    public abstract boolean shouldShowProgressBar(T obj);
 
     @Override
     public View getView(int i, View convertView, ViewGroup viewGroup) {
@@ -61,16 +60,8 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
         TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
         ProgressBar prgView = (ProgressBar) convertView.findViewById(R.id.grid_spinner);
 
-        if (prgView != null) {
-            if (shouldShowProgressBar(itemList.get(i))) {
-                prgView.setVisibility(View.VISIBLE);
-            }
-            else {
-                prgView.setVisibility(View.INVISIBLE);
-            }
-        }
         if (imgView != null) {
-            if (!populateImageView(imgView, itemList.get(i))) {
+            if (!populateImageView(imgView, prgView, itemList.get(i))) {
                 imgView.setImageBitmap(null);
             }
         }

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

@@ -1,7 +1,9 @@
 package com.limelight.grid;
 
 import android.content.Context;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.limelight.PcView;
@@ -26,7 +28,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
         Collections.sort(itemList, new Comparator<PcView.ComputerObject>() {
             @Override
             public int compare(PcView.ComputerObject lhs, PcView.ComputerObject rhs) {
-                return lhs.details.name.compareTo(rhs.details.name);
+                return lhs.details.name.toLowerCase().compareTo(rhs.details.name.toLowerCase());
             }
         });
     }
@@ -36,7 +38,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
     }
 
     @Override
-    public boolean populateImageView(ImageView imgView, PcView.ComputerObject obj) {
+    public boolean populateImageView(ImageView imgView, ProgressBar prgView, PcView.ComputerObject obj) {
         if (obj.details.state == ComputerDetails.State.ONLINE) {
             imgView.setAlpha(1.0f);
         }
@@ -44,6 +46,13 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             imgView.setAlpha(0.4f);
         }
 
+        if (obj.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
+            prgView.setVisibility(View.VISIBLE);
+        }
+        else {
+            prgView.setVisibility(View.INVISIBLE);
+        }
+
         imgView.setImageResource(R.drawable.ic_computer);
         return true;
     }
@@ -70,10 +79,4 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
         }
         return false;
     }
-
-    @Override
-    public boolean shouldShowProgressBar(PcView.ComputerObject obj) {
-        // Still refreshing this PC so display the progress bar
-        return obj.details.reachability == ComputerDetails.Reachability.UNKNOWN;
-    }
 }

app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java

@@ -5,7 +5,9 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
@@ -130,12 +132,14 @@ public class CachedAppAssetLoader {
 
     private class LoaderTask extends AsyncTask<LoaderTuple, Void, Bitmap> {
         private final WeakReference<ImageView> imageViewRef;
+        private final WeakReference<ProgressBar> progressViewRef;
         private final boolean diskOnly;
 
         private LoaderTuple tuple;
 
-        public LoaderTask(ImageView imageView, boolean diskOnly) {
+        public LoaderTask(ImageView imageView, ProgressBar prgView, boolean diskOnly) {
             this.imageViewRef = new WeakReference<>(imageView);
+            this.progressViewRef = new WeakReference<>(prgView);
             this.diskOnly = diskOnly;
         }
 
@@ -143,8 +147,8 @@ public class CachedAppAssetLoader {
         protected Bitmap doInBackground(LoaderTuple... params) {
             tuple = params[0];
 
-            // Check whether it has been cancelled or the image view is gone
+            // Check whether it has been cancelled or the views are gone
-            if (isCancelled() || imageViewRef.get() == null) {
+            if (isCancelled() || imageViewRef.get() == null || progressViewRef.get() == null) {
                 return null;
             }
 
@@ -177,11 +181,17 @@ public class CachedAppAssetLoader {
 
             // If the current loader task for this view isn't us, do nothing
             final ImageView imageView = imageViewRef.get();
+            final ProgressBar prgView = progressViewRef.get();
             if (getLoaderTask(imageView) == this) {
+                // Now display the progress bar since we have to hit the network
+                if (prgView != null) {
+                    prgView.setVisibility(View.VISIBLE);
+                }
+
                 // Set off another loader task on the network executor
-                LoaderTask task = new LoaderTask(imageView, false);
+                LoaderTask task = new LoaderTask(imageView, prgView, false);
                 AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
-                imageView.setAlpha(1.0f);
+                imageView.setVisibility(View.VISIBLE);
                 imageView.setImageDrawable(asyncDrawable);
                 task.executeOnExecutor(networkExecutor, tuple);
             }
@@ -195,14 +205,20 @@ public class CachedAppAssetLoader {
             }
 
             final ImageView imageView = imageViewRef.get();
+            final ProgressBar prgView = progressViewRef.get();
             if (getLoaderTask(imageView) == this) {
                 // Set the bitmap
                 if (bitmap != null) {
                     imageView.setImageBitmap(bitmap);
                 }
 
+                // Hide the progress bar
+                if (prgView != null) {
+                    prgView.setVisibility(View.INVISIBLE);
+                }
+
                 // Show the view
-                imageView.setAlpha(1.0f);
+                imageView.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -280,31 +296,34 @@ public class CachedAppAssetLoader {
         });
     }
 
-    public boolean populateImageView(NvApp app, ImageView view) {
+    public boolean populateImageView(NvApp app, ImageView imgView, ProgressBar prgView) {
         LoaderTuple tuple = new LoaderTuple(computer, app);
 
         // If there's already a task in progress for this view,
         // cancel it. If the task is already loading the same image,
         // we return and let that load finish.
-        if (!cancelPendingLoad(tuple, view)) {
+        if (!cancelPendingLoad(tuple, imgView)) {
             return true;
         }
 
+        // Hide the progress bar always on initial load
+        prgView.setVisibility(View.INVISIBLE);
+
         // First, try the memory cache in the current context
         Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
         if (bmp != null) {
             // Show the bitmap immediately
-            view.setAlpha(1.0f);
+            imgView.setVisibility(View.VISIBLE);
-            view.setImageBitmap(bmp);
+            imgView.setImageBitmap(bmp);
             return true;
         }
 
         // If it's not in memory, create an async task to load it. This task will be attached
         // via AsyncDrawable to this view.
-        final LoaderTask task = new LoaderTask(view, true);
+        final LoaderTask task = new LoaderTask(imgView, prgView, true);
-        final AsyncDrawable asyncDrawable = new AsyncDrawable(view.getResources(), placeholderBitmap, task);
+        final AsyncDrawable asyncDrawable = new AsyncDrawable(imgView.getResources(), placeholderBitmap, task);
-        view.setAlpha(0.0f);
+        imgView.setVisibility(View.INVISIBLE);
-        view.setImageDrawable(asyncDrawable);
+        imgView.setImageDrawable(asyncDrawable);
 
         // Run the task on our foreground executor
         task.executeOnExecutor(foregroundExecutor, tuple);

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

@@ -0,0 +1,115 @@
+package com.limelight.utils;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.os.Build;
+
+import com.limelight.AppView;
+import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+public class ShortcutHelper {
+
+    private final ShortcutManager sm;
+    private final Context context;
+
+    public ShortcutHelper(Context context) {
+        this.context = context;
+        if (Build.VERSION.SDK_INT >= 25) {
+            sm = context.getSystemService(ShortcutManager.class);
+        }
+        else {
+            sm = null;
+        }
+    }
+
+    @TargetApi(25)
+    private void reapShortcutsForDynamicAdd() {
+        List<ShortcutInfo> dynamicShortcuts = sm.getDynamicShortcuts();
+        while (dynamicShortcuts.size() >= sm.getMaxShortcutCountPerActivity()) {
+            ShortcutInfo maxRankShortcut = dynamicShortcuts.get(0);
+            for (ShortcutInfo scut : dynamicShortcuts) {
+                if (maxRankShortcut.getRank() < scut.getRank()) {
+                    maxRankShortcut = scut;
+                }
+            }
+            sm.removeDynamicShortcuts(Arrays.asList(maxRankShortcut.getId()));
+        }
+    }
+
+    @TargetApi(25)
+    private List<ShortcutInfo> getAllShortcuts() {
+        LinkedList<ShortcutInfo> list = new LinkedList<>();
+        list.addAll(sm.getDynamicShortcuts());
+        list.addAll(sm.getPinnedShortcuts());
+        return list;
+    }
+
+    @TargetApi(25)
+    private ShortcutInfo getInfoForId(String id) {
+        List<ShortcutInfo> shortcuts = getAllShortcuts();
+
+        for (ShortcutInfo info : shortcuts) {
+            if (info.getId().equals(id)) {
+                return info;
+            }
+        }
+
+        return null;
+    }
+
+    public void reportShortcutUsed(String id) {
+        if (Build.VERSION.SDK_INT >= 25) {
+            ShortcutInfo sinfo = getInfoForId(id);
+            if (sinfo != null) {
+                sm.reportShortcutUsed(id);
+            }
+        }
+    }
+
+    public void createAppViewShortcut(String id, ComputerDetails details) {
+        if (Build.VERSION.SDK_INT >= 25) {
+            Intent i = new Intent(context, AppView.class);
+            i.putExtra(AppView.NAME_EXTRA, details.name);
+            i.putExtra(AppView.UUID_EXTRA, details.uuid.toString());
+            i.putExtra(AppView.SHORTCUT_EXTRA, true);
+            i.setAction(Intent.ACTION_DEFAULT);
+
+            ShortcutInfo sinfo = new ShortcutInfo.Builder(context, id)
+                    .setIntent(i)
+                    .setShortLabel(details.name)
+                    .setLongLabel(details.name)
+                    .build();
+
+            ShortcutInfo existingSinfo = getInfoForId(id);
+            if (existingSinfo != null) {
+                // Update in place
+                sm.updateShortcuts(Arrays.asList(sinfo));
+                sm.enableShortcuts(Arrays.asList(id));
+            }
+            else {
+                // Reap shortcuts to make space for this new one
+                reapShortcutsForDynamicAdd();
+
+                // Add the new shortcut
+                //TODO: Testing and proper icon - sm.addDynamicShortcuts(Arrays.asList(sinfo));
+            }
+        }
+    }
+
+    public void disableShortcut(String id, CharSequence reason) {
+        if (Build.VERSION.SDK_INT >= 25) {
+            ShortcutInfo sinfo = getInfoForId(id);
+            if (sinfo != null) {
+                sm.disableShortcuts(Arrays.asList(id), reason);
+            }
+        }
+    }
+}

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

@@ -15,6 +15,8 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
+#include <arpa/inet.h>
+
 #include <android/log.h>
 
 #define EVDEV_MAX_EVENT_SIZE 24

app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c

@@ -19,7 +19,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this,
 	ChannelCount = channelCount;
 
 	jni_mapping_data = (*env)->GetByteArrayElements(env, mapping, 0);
-	ret =  nv_opus_init(sampleRate, channelCount, streams, coupledStreams, jni_mapping_data);
+	ret =  nv_opus_init(sampleRate, channelCount, streams, coupledStreams,
+						(const unsigned char*)jni_mapping_data);
 	(*env)->ReleaseByteArrayElements(env, mapping, jni_mapping_data, JNI_ABORT);
 
 	return ret;
@@ -49,7 +50,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
 	if (indata != NULL) {
 		jni_input_data = (*env)->GetByteArrayElements(env, indata, 0);
 
-		ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data, SamplesPerChannel);
+		ret = nv_opus_decode((unsigned char*)&jni_input_data[inoff], inlen,
+							 (jshort*)jni_pcm_data, SamplesPerChannel);
 
 		// The input data isn't changed so it can be safely aborted
 		(*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT);

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Shortcut strings -->
+    <string name="scut_deleted_pc">PC deleted</string>
+    <string name="scut_not_paired">PC not paired</string>
 
     <!-- PC view menu entries -->
     <string name="pcview_menu_app_list">View Game List</string>
@@ -16,6 +19,7 @@
     <string name="pair_pairing_msg">Please enter the following PIN on the target PC:</string>
     <string name="pair_incorrect_pin">Incorrect PIN</string>
     <string name="pair_fail">Pairing failed</string>
+    <string name="pair_already_in_progress">Pairing already in progress</string>
 
     <!-- WOL messages -->
     <string name="wol_pc_online">Computer is online</string>
@@ -55,13 +59,15 @@
 
     <!-- General strings -->
     <string name="ip_hint">IP address of GeForce PC</string>
-    <string name="searching_pc">Searching for PCs with GeForce Experience running…</string>
+    <string name="searching_pc">Searching for PCs with GameStream running…\n\n
+        Ensure GameStream is enabled in the GeForce Experience SHIELD settings.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="lost_connection">Lost connection to PC</string>
 
     <!-- AppList activity -->
     <string name="title_applist">Apps on</string>
+    <string name="applist_connect_msg">Connecting to PC…</string>
     <string name="applist_menu_resume">Resume Session</string>
     <string name="applist_menu_quit">Quit Session</string>
     <string name="applist_menu_quit_and_start">Quit Current Game and Start</string>

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Feb 06 16:21:20 EST 2016
+#Fri Aug 26 22:01:33 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

moonlight-android.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>