Version 5.8.1-r3

.gitignore

@@ -30,7 +30,7 @@ Thumbs.db
 #.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
 build/
-app/app.iml
+*.iml
 
 # Compiled JNI libraries folder
 **/jniLibs

app/build.gradle

@@ -1,14 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    buildToolsVersion '28.0.0'
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
 
-        versionName "5.7.2"
-        versionCode = 150
+        versionName "5.8.1"
+        versionCode = 166
     }
 
     flavorDimensions "root"
@@ -45,9 +46,27 @@ android {
         disable 'MissingTranslation'
     }
 
+    bundle {
+        language {
+            // Avoid splitting by language, since we allow users
+            // to manually switch language in settings.
+            enableSplit = false
+        }
+        density {
+            // FIXME: This should not be neccessary but we get
+            // weird crashes due to missing drawable resources
+            // when this split is enabled.
+            enableSplit = false
+        }
+    }
+
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
+
+            minifyEnabled true
+            useProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             // To whomever is releasing/using an APK in release mode with
@@ -82,8 +101,8 @@ android {
             // TL;DR: Leave the following line alone!
             applicationIdSuffix ".unofficial"
 
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 

app/proguard-rules.pro

@@ -0,0 +1,27 @@
+# Don't obfuscate code
+-dontobfuscate
+
+# Our code
+-keep class com.limelight.binding.input.evdev.* {*;}
+
+# Moonlight common
+-keep class com.limelight.nvstream.jni.* {*;}
+
+# Okio
+-keep class sun.misc.Unsafe {*;}
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**
+
+# BouncyCastle
+-keep class org.bouncycastle.jcajce.provider.asymmetric.* {*;}
+-keep class org.bouncycastle.jcajce.provider.asymmetric.util.* {*;}
+-keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.* {*;}
+-keep class org.bouncycastle.jcajce.provider.digest.** {*;}
+-keep class org.bouncycastle.jcajce.provider.symmetric.** {*;}
+-keep class org.bouncycastle.jcajce.spec.* {*;}
+-keep class org.bouncycastle.jce.** {*;}
+-dontwarn javax.naming.**
+
+# jMDNS
+-dontwarn javax.jmdns.impl.DNSCache

app/src/main/AndroidManifest.xml

@@ -99,10 +99,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
+        <!-- This will fall back to sensorLandscape at runtime on Android 4.2 and below -->
         <activity
             android:name=".Game"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-            android:screenOrientation="sensorLandscape"
+            android:screenOrientation="userLandscape"
             android:noHistory="true"
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"

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

@@ -69,6 +69,13 @@ public class AppViewShortcutTrampoline extends Activity {
                                             blockingLoadSpinner = null;
                                         }
 
+                                        // If the managerBinder was destroyed before this callback,
+                                        // just finish the activity.
+                                        if (managerBinder == null) {
+                                            finish();
+                                            return;
+                                        }
+
                                         if (details.state == ComputerDetails.State.ONLINE) {
                                             // Close this activity
                                             finish();

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

@@ -39,6 +39,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.input.InputManager;
@@ -69,7 +71,7 @@ import android.widget.Toast;
 
 public class Game extends Activity implements SurfaceHolder.Callback,
     OnGenericMotionListener, OnTouchListener, NvConnectionListener, EvdevListener,
-    OnSystemUiVisibilityChangeListener, GameGestures
+    OnSystemUiVisibilityChangeListener, GameGestures, StreamView.InputCallbacks
 {
     private int lastMouseX = Integer.MIN_VALUE;
     private int lastMouseY = Integer.MIN_VALUE;
@@ -95,6 +97,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private boolean displayedFailureDialog = false;
     private boolean connecting = false;
     private boolean connected = false;
+    private boolean surfaceCreated = false;
+    private boolean attemptedConnection = false;
 
     private InputCaptureProvider inputCaptureProvider;
     private int modifierFlags = 0;
@@ -142,10 +146,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // 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);
+        // Full-screen
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
         // If we're going to use immersive mode, we want to have
         // the entire screen
@@ -158,6 +160,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
         }
 
+        // We specified userLandscape in the manifest which isn't supported until 4.3,
+        // so we must fall back at runtime to sensorLandscape.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+
         // Listen for UI visibility events
         getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
 
@@ -175,11 +183,18 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         prefConfig = PreferenceConfiguration.readPreferences(this);
         tombstonePrefs = Game.this.getSharedPreferences("DecoderTombstone", 0);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefConfig.stretchVideo) {
+            // Allow the activity to layout under notches if the fill-screen option
+            // was turned on by the user
+            getWindow().getAttributes().layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
 
         // Listen for events on the game surface
         streamView = findViewById(R.id.surfaceView);
         streamView.setOnGenericMotionListener(this);
         streamView.setOnTouchListener(this);
+        streamView.setInputCallbacks(this);
 
         inputCaptureProvider = InputCaptureManager.getInputCaptureProvider(this, this);
 
@@ -296,8 +311,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
 
         int gamepadMask = ControllerHandler.getAttachedControllerMask(this);
-        if (!prefConfig.multiController && gamepadMask != 0) {
-            // If any gamepads are present in non-MC mode, set only gamepad 1.
+        if (!prefConfig.multiController) {
+            // Always set gamepad 1 present for when multi-controller is
+            // disabled for games that don't properly support detection
+            // of gamepads removed and replugged at runtime.
             gamepadMask = 1;
         }
         if (prefConfig.onscreenController) {
@@ -415,19 +432,46 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         streamView.getHolder().addCallback(this);
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (virtualController != null) {
+            // Refresh layout of OSC for possible new screen size
+            virtualController.refreshLayout();
+
+            // Hide OSC in PiP
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                if (isInPictureInPictureMode()) {
+                    virtualController.hide();
+                }
+                else {
+                    virtualController.show();
+                }
+            }
+        }
+    }
+
     @Override
     public void onUserLeaveHint() {
         super.onUserLeaveHint();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             if (prefConfig.enablePip && connected) {
-                enterPictureInPictureMode(
-                        new PictureInPictureParams.Builder()
-                                .setAspectRatio(new Rational(prefConfig.width, prefConfig.height))
-                                .setSourceRectHint(new Rect(
-                                        streamView.getLeft(), streamView.getTop(),
-                                        streamView.getRight(), streamView.getBottom()))
-                                .build());
+                try {
+                    // This has thrown all sorts of weird exceptions on Samsung devices
+                    // running Oreo. Just eat them and close gracefully on leave, rather
+                    // than crashing.
+                    enterPictureInPictureMode(
+                            new PictureInPictureParams.Builder()
+                                    .setAspectRatio(new Rational(prefConfig.width, prefConfig.height))
+                                    .setSourceRectHint(new Rect(
+                                            streamView.getLeft(), streamView.getTop(),
+                                            streamView.getRight(), streamView.getBottom()))
+                                    .build());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
     }
@@ -779,9 +823,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return handleKeyDown(event) || super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean handleKeyDown(KeyEvent event) {
         // Pass-through virtual navigation keys
         if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-            return super.onKeyDown(keyCode, event);
+            return false;
         }
 
         // Handle a synthetic back button event that some Android OS versions
@@ -793,11 +842,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         boolean handled = false;
 
-        boolean detectedGamepad = event.getDevice() != null && ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
-                (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
-        if (detectedGamepad || (event.getDevice() == null ||
-                event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC
-        )) {
+        if (ControllerHandler.isGameControllerDevice(event.getDevice())) {
             // Always try the controller handler first, unless it's an alphanumeric keyboard device.
             // Otherwise, controller handler will eat keyboard d-pad events.
             handled = controllerHandler.handleButtonDown(event);
@@ -807,17 +852,17 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             // Try the keyboard handler
             short translated = KeyboardTranslator.translate(event.getKeyCode());
             if (translated == 0) {
-                return super.onKeyDown(keyCode, event);
+                return false;
             }
 
             // Let this method take duplicate key down events
-            if (handleSpecialKeys(keyCode, true)) {
+            if (handleSpecialKeys(event.getKeyCode(), true)) {
                 return true;
             }
 
             // Pass through keyboard input if we're not grabbing
             if (!grabbedInput) {
-                return super.onKeyDown(keyCode, event);
+                return false;
             }
 
             conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, getModifierState(event));
@@ -828,9 +873,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
+        return handleKeyUp(event) || super.onKeyUp(keyCode, event);
+    }
+
+    @Override
+    public boolean handleKeyUp(KeyEvent event) {
         // Pass-through virtual navigation keys
         if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-            return super.onKeyUp(keyCode, event);
+            return false;
         }
 
         // Handle a synthetic back button event that some Android OS versions
@@ -841,11 +891,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
 
         boolean handled = false;
-        boolean detectedGamepad = event.getDevice() != null && ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
-                (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
-        if (detectedGamepad || (event.getDevice() == null ||
-                event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC
-        )) {
+        if (ControllerHandler.isGameControllerDevice(event.getDevice())) {
             // Always try the controller handler first, unless it's an alphanumeric keyboard device.
             // Otherwise, controller handler will eat keyboard d-pad events.
             handled = controllerHandler.handleButtonUp(event);
@@ -855,16 +901,16 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             // Try the keyboard handler
             short translated = KeyboardTranslator.translate(event.getKeyCode());
             if (translated == 0) {
-                return super.onKeyUp(keyCode, event);
+                return false;
             }
 
-            if (handleSpecialKeys(keyCode, false)) {
+            if (handleSpecialKeys(event.getKeyCode(), false)) {
                 return true;
             }
 
             // Pass through keyboard input if we're not grabbing
             if (!grabbedInput) {
-                return super.onKeyUp(keyCode, event);
+                return false;
             }
 
             conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, getModifierState(event));
@@ -961,6 +1007,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     lastMouseX = (int)event.getX();
                     lastMouseY = (int)event.getY();
                 }
+                else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    // We get a normal (non-relative) MotionEvent when starting pointer capture to synchronize the
+                    // location of the cursor with our app. We don't want this, so we must discard this event.
+                    lastMouseX = (int)event.getX();
+                    lastMouseY = (int)event.getY();
+                }
                 else {
                     // First process the history
                     for (int i = 0; i < event.getHistorySize(); i++) {
@@ -1115,10 +1167,15 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void stageStarting(String stage) {
-        if (spinner != null) {
-            spinner.setMessage(getResources().getString(R.string.conn_starting)+" "+stage);
-        }
+    public void stageStarting(final String stage) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (spinner != null) {
+                    spinner.setMessage(getResources().getString(R.string.conn_starting) + " " + stage);
+                }
+            }
+        });
     }
 
     @Override
@@ -1143,70 +1200,78 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void stageFailed(String stage, long errorCode) {
-        if (spinner != null) {
-            spinner.dismiss();
-            spinner = null;
-        }
+    public void stageFailed(final String stage, final long errorCode) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (spinner != null) {
+                    spinner.dismiss();
+                    spinner = null;
+                }
 
-        // Enable cursor visibility again
-        inputCaptureProvider.disableCapture();
+                if (!displayedFailureDialog) {
+                    displayedFailureDialog = true;
+                    LimeLog.severe(stage + " failed: " + errorCode);
 
-        if (!displayedFailureDialog) {
-            displayedFailureDialog = true;
-            LimeLog.severe(stage+" failed: "+errorCode);
-
-            // If video initialization failed and the surface is still valid, display extra information for the user
-            if (stage.contains("video") && streamView.getHolder().getSurface().isValid()) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
+                    // If video initialization failed and the surface is still valid, display extra information for the user
+                    if (stage.contains("video") && streamView.getHolder().getSurface().isValid()) {
                         Toast.makeText(Game.this, "Video decoder failed to initialize. Your device may not support the selected resolution.", Toast.LENGTH_LONG).show();
                     }
-                });
-            }
 
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title),
-                    getResources().getString(R.string.conn_error_msg)+" "+stage, true);
-        }
+                    Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_error_title),
+                            getResources().getString(R.string.conn_error_msg) + " " + stage, true);
+                }
+            }
+        });
     }
 
     @Override
-    public void connectionTerminated(long errorCode) {
-        // Enable cursor visibility again
-        inputCaptureProvider.disableCapture();
+    public void connectionTerminated(final long errorCode) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                // Let the display go to sleep now
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        if (!displayedFailureDialog) {
-            displayedFailureDialog = true;
-            LimeLog.severe("Connection terminated: "+errorCode);
-            stopConnection();
+                // Enable cursor visibility again
+                inputCaptureProvider.disableCapture();
 
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
-                    getResources().getString(R.string.conn_terminated_msg), true);
-        }
+                if (!displayedFailureDialog) {
+                    displayedFailureDialog = true;
+                    LimeLog.severe("Connection terminated: " + errorCode);
+                    stopConnection();
+
+                    Dialog.displayDialog(Game.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;
-
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
+                if (spinner != null) {
+                    spinner.dismiss();
+                    spinner = null;
+                }
+
+                connected = true;
+                connecting = false;
+
                 // Hide the mouse cursor now. Doing it before
                 // dismissing the spinner seems to be undone
                 // when the spinner gets displayed.
                 inputCaptureProvider.enableCapture();
+
+                // Keep the display on
+                getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+                hideSystemUi(1000);
             }
         });
-
-        hideSystemUi(1000);
     }
 
     @Override
@@ -1233,12 +1298,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-    }
+        if (!surfaceCreated) {
+            throw new IllegalStateException("Surface changed before creation!");
+        }
 
-    @Override
-    public void surfaceCreated(SurfaceHolder holder) {
-        if (!connected && !connecting) {
-            connecting = true;
+        if (!attemptedConnection) {
+            attemptedConnection = true;
 
             decoderRenderer.setRenderTarget(holder);
             conn.start(PlatformBinding.getAudioRenderer(), decoderRenderer, Game.this);
@@ -1246,12 +1311,23 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        // Let the decoder know immediately that the surface is gone
-        decoderRenderer.prepareForStop();
+    public void surfaceCreated(SurfaceHolder holder) {
+        surfaceCreated = true;
+    }
 
-        if (connected) {
-            stopConnection();
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        if (!surfaceCreated) {
+            throw new IllegalStateException("Surface destroyed before creation!");
+        }
+
+        if (attemptedConnection) {
+            // Let the decoder know immediately that the surface is gone
+            decoderRenderer.prepareForStop();
+
+            if (connected) {
+                stopConnection();
+            }
         }
     }
 

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

@@ -452,7 +452,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             return;
         }
 
-        Toast.makeText(PcView.this, getResources().getString(R.string.wol_waking_pc), Toast.LENGTH_SHORT).show();
         new Thread(new Runnable() {
             @Override
             public void run() {

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

@@ -149,6 +149,30 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         onInputDeviceAdded(deviceId);
     }
 
+    private static boolean hasJoystickAxes(InputDevice device) {
+        return (device.getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK &&
+                getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_X) != null &&
+                getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_Y) != null;
+    }
+
+    private static boolean hasGamepadButtons(InputDevice device) {
+        return (device.getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD;
+    }
+
+    public static boolean isGameControllerDevice(InputDevice device) {
+        if (device == null) {
+            return true;
+        }
+
+        if (hasJoystickAxes(device) || hasGamepadButtons(device)) {
+            // Has real joystick axes or gamepad buttons
+            return true;
+        }
+
+        // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
+        return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
+    }
+
     public static short getAttachedControllerMask(Context context) {
         int count = 0;
         short mask = 0;
@@ -161,7 +185,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 continue;
             }
 
-            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0) {
+            if (hasJoystickAxes(dev)) {
                 LimeLog.info("Counting InputDevice: "+dev.getName());
                 mask |= 1 << count++;
             }
@@ -835,16 +859,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // to normal behavior, so ignore triggersIdleNegative for each trigger until
             // first touch.
             if (lt != 0) {
-                context.leftTriggerUsed = true;
+                context.leftTriggerAxisUsed = true;
             }
             if (rt != 0) {
-                context.rightTriggerUsed = true;
+                context.rightTriggerAxisUsed = true;
             }
             if (context.triggersIdleNegative) {
-                if (context.leftTriggerUsed) {
+                if (context.leftTriggerAxisUsed) {
                     lt = (lt + 1) / 2;
                 }
-                if (context.rightTriggerUsed) {
+                if (context.rightTriggerAxisUsed) {
                     rt = (rt + 1) / 2;
                 }
             }
@@ -1040,15 +1064,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-            if (context.leftTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.leftTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.leftTrigger = 0;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-            if (context.rightTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.rightTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.rightTrigger = 0;
@@ -1160,15 +1184,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap |= ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-            if (context.leftTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.leftTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.leftTrigger = (byte)0xFF;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-            if (context.rightTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.rightTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.rightTrigger = (byte)0xFF;
@@ -1299,7 +1323,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public int leftTriggerAxis = -1;
         public int rightTriggerAxis = -1;
         public boolean triggersIdleNegative;
-        public boolean leftTriggerUsed, rightTriggerUsed;
+        public boolean leftTriggerAxisUsed, rightTriggerAxisUsed;
 
         public int hatXAxis = -1;
         public int hatYAxis = -1;

app/src/main/java/com/limelight/binding/input/virtual_controller/AnalogStick.java

@@ -210,7 +210,7 @@ public class AnalogStick extends VirtualControllerElement {
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         // calculate new radius sizes depending
-        radius_complete = getPercent(getCorrectWidth() / 2, 90);
+        radius_complete = getPercent(getCorrectWidth() / 2, 100);
         radius_dead_zone = getPercent(getCorrectWidth() / 2, 30);
         radius_analog_stick = getPercent(getCorrectWidth() / 2, 20);
 

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java

@@ -86,6 +86,14 @@ public class VirtualController {
         });
     }
 
+    public void hide() {
+        relative_layout.setVisibility(View.INVISIBLE);
+    }
+
+    public void show() {
+        relative_layout.setVisibility(View.VISIBLE);
+    }
+
     public void removeElements() {
         for (VirtualControllerElement element : elements) {
             relative_layout.removeView(element);

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

@@ -1,7 +1,6 @@
 package com.limelight.binding.video;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.Locale;
 
 import org.jcodec.codecs.h264.H264Utils;
@@ -41,7 +40,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
     private MediaCodec videoDecoder;
     private Thread rendererThread;
-    private Thread[] spinnerThreads;
     private boolean needsSpsBitstreamFixup, isExynos4;
     private boolean adaptivePlayback, directSubmit;
     private boolean constrainedHighProfile;
@@ -132,14 +130,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         this.consecutiveCrashCount = consecutiveCrashCount;
         this.glRenderer = glRenderer;
 
-        // Disable spinner threads in battery saver mode or 4K
-        if (prefs.batterySaver || prefs.height >= 2160) {
-            spinnerThreads = new Thread[0];
-        }
-        else {
-            spinnerThreads = new Thread[Runtime.getRuntime().availableProcessors()];
-        }
-
         avcDecoder = findAvcDecoder();
         if (avcDecoder != null) {
             LimeLog.info("Selected AVC decoder: "+avcDecoder.getName());
@@ -217,15 +207,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     }
 
     public void notifyVideoForeground() {
-        startSpinnerThreads();
         foreground = true;
     }
 
     public void notifyVideoBackground() {
-        // Signal the spinner threads to stop but
-        // don't wait for them to terminate to avoid
-        // delaying the state transition
-        signalSpinnerStop();
         foreground = false;
     }
 
@@ -462,73 +447,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         rendererThread.start();
     }
 
-    private void startSpinnerThread(final int i) {
-        spinnerThreads[i] = new Thread() {
-            @Override
-            public void run() {
-                // This thread exists to keep the CPU at a higher DVFS state on devices
-                // where the governor scales clock speed sporadically, causing dropped frames.
-                //
-                // Run until we notice our thread has been removed from the spinner threads
-                // array. Even if we don't notice immediately, we'll notice soon enough.
-                // This will also ensure we terminate even if someone has restarted spinning
-                // before we realized we should stop.
-                while (this == spinnerThreads[i]) {
-                    try {
-                        Thread.sleep(0, 1);
-                    } catch (InterruptedException e) {
-                        break;
-                    }
-                }
-            }
-        };
-        spinnerThreads[i].setName("Spinner-"+i);
-        spinnerThreads[i].setPriority(Thread.MIN_PRIORITY);
-        spinnerThreads[i].start();
-    }
-
-    private void startSpinnerThreads() {
-        LimeLog.info("Using "+spinnerThreads.length+" spinner threads");
-        for (int i = 0; i < spinnerThreads.length; i++) {
-            if (spinnerThreads[i] != null) {
-                continue;
-            }
-
-            startSpinnerThread(i);
-        }
-    }
-
-    private Thread[] signalSpinnerStop() {
-        // Capture current running threads
-        Thread[] runningThreads = Arrays.copyOf(spinnerThreads, spinnerThreads.length);
-
-        // Clear the spinner threads to signal their termination
-        for (int i = 0; i < spinnerThreads.length; i++) {
-            spinnerThreads[i] = null;
-        }
-
-        // Interrupt the threads
-        for (int i = 0; i < runningThreads.length; i++) {
-            if (runningThreads[i] != null) {
-                runningThreads[i].interrupt();
-            }
-        }
-
-        return runningThreads;
-    }
-
-    private void stopSpinnerThreads() {
-        // Signal and wait for the threads to stop
-        Thread[] runningThreads = signalSpinnerStop();
-        for (int i = 0; i < runningThreads.length; i++) {
-            if (runningThreads[i] != null) {
-                try {
-                    runningThreads[i].join();
-                } catch (InterruptedException ignored) { }
-            }
-        }
-    }
-
     private int dequeueInputBuffer() {
         int index = -1;
         long startTime;
@@ -570,7 +488,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     @Override
     public void start() {
         startRendererThread();
-        startSpinnerThreads();
     }
 
     // !!! May be called even if setup()/start() fails !!!
@@ -593,9 +510,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         try {
             rendererThread.join();
         } catch (InterruptedException ignored) { }
-
-        // Halt the spinner threads
-        stopSpinnerThreads();
     }
 
     @Override
@@ -718,7 +632,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                     LimeLog.info("Patching level_idc to 31");
                     sps.levelIdc = 31;
                 }
-                if (initialWidth <= 1280 && initialHeight <= 720) {
+                else if (initialWidth <= 1280 && initialHeight <= 720) {
                     // Max 5 buffered frames at 1280x720x60
                     LimeLog.info("Patching level_idc to 32");
                     sps.levelIdc = 32;

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

@@ -71,8 +71,8 @@ public class MediaCodecHelper {
 		blacklistedDecoderPrefixes = new LinkedList<>();
 
 		// Blacklist software decoders that don't support H264 high profile,
-		// but exclude the official AOSP emulator from this restriction.
-		if (!Build.HARDWARE.equals("ranchu") || !Build.BRAND.equals("google")) {
+		// but exclude the official AOSP and CrOS emulator from this restriction.
+		if (!Build.HARDWARE.equals("ranchu") && !Build.HARDWARE.equals("cheets")) {
 			blacklistedDecoderPrefixes.add("omx.google");
 			blacklistedDecoderPrefixes.add("AVCDecoder");
 		}
@@ -135,6 +135,7 @@ public class MediaCodecHelper {
 		// to actually be tested. Ugh...
 		if (Build.MANUFACTURER.equalsIgnoreCase("Amazon")) {
 			whitelistedHevcDecoders.add("omx.mtk");
+			whitelistedHevcDecoders.add("omx.amlogic");
 		}
 
 		// These theoretically have good HEVC decoding capabilities (potentially better than
@@ -336,7 +337,7 @@ public class MediaCodecHelper {
 
 		// This device seems to crash constantly at 720p, so try disabling
 		// RFI to see if we can get that under control.
-		if (Build.PRODUCT.equalsIgnoreCase("b3_att_us")) {
+		if (Build.DEVICE.equals("b3") || Build.DEVICE.equals("b5")) {
 			return false;
 		}
 

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

@@ -1,7 +1,6 @@
 package com.limelight.grid;
 
 import android.app.Activity;
-import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -46,13 +45,10 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         }
         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()));
+                new DiskAssetLoader(context));
     }
 
     public void cancelQueuedOperations() {

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

@@ -1,7 +1,11 @@
 package com.limelight.grid.assets;
 
+import android.app.ActivityManager;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.ImageDecoder;
+import android.os.Build;
 
 import com.limelight.LimeLog;
 import com.limelight.utils.CacheHelper;
@@ -19,10 +23,19 @@ public class DiskAssetLoader {
     private static final int STANDARD_ASSET_WIDTH = 300;
     private static final int STANDARD_ASSET_HEIGHT = 400;
 
+    private final boolean isLowRamDevice;
     private final File cacheDir;
 
-    public DiskAssetLoader(File cacheDir) {
-        this.cacheDir = cacheDir;
+    public DiskAssetLoader(Context context) {
+        this.cacheDir = context.getCacheDir();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            this.isLowRamDevice =
+                    ((ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE)).isLowRamDevice();
+        }
+        else {
+            // Use conservative low RAM behavior on very old devices
+            this.isLowRamDevice = true;
+        }
     }
 
     public boolean checkCacheExists(CachedAppAssetLoader.LoaderTuple tuple) {
@@ -66,28 +79,55 @@ public class DiskAssetLoader {
             return null;
         }
 
-        // Lookup bounds of the downloaded image
-        BitmapFactory.Options decodeOnlyOptions = new BitmapFactory.Options();
-        decodeOnlyOptions.inJustDecodeBounds = true;
-        BitmapFactory.decodeFile(file.getAbsolutePath(), decodeOnlyOptions);
-        if (decodeOnlyOptions.outWidth <= 0 || decodeOnlyOptions.outHeight <= 0) {
-            // Dimensions set to -1 on error. Return value always null.
-            return null;
+        Bitmap bmp;
+
+        // For OSes prior to P, we have to use the ugly BitmapFactory API
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            // Lookup bounds of the downloaded image
+            BitmapFactory.Options decodeOnlyOptions = new BitmapFactory.Options();
+            decodeOnlyOptions.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(file.getAbsolutePath(), decodeOnlyOptions);
+            if (decodeOnlyOptions.outWidth <= 0 || decodeOnlyOptions.outHeight <= 0) {
+                // Dimensions set to -1 on error. Return value always null.
+                return null;
+            }
+
+            LimeLog.info("Tuple "+tuple+" has cached art of size: "+decodeOnlyOptions.outWidth+"x"+decodeOnlyOptions.outHeight);
+
+            // Load the image scaled to the appropriate size
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inSampleSize = calculateInSampleSize(decodeOnlyOptions,
+                    STANDARD_ASSET_WIDTH / sampleSize,
+                    STANDARD_ASSET_HEIGHT / sampleSize);
+            if (isLowRamDevice) {
+                options.inPreferredConfig = Bitmap.Config.RGB_565;
+                options.inDither = true;
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                options.inPreferredConfig = Bitmap.Config.HARDWARE;
+            }
+
+            bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+            if (bmp != null) {
+                LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+            }
         }
-
-        LimeLog.info("Tuple "+tuple+" has cached art of size: "+decodeOnlyOptions.outWidth+"x"+decodeOnlyOptions.outHeight);
-
-        // Load the image scaled to the appropriate size
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = calculateInSampleSize(decodeOnlyOptions,
-                STANDARD_ASSET_WIDTH / sampleSize,
-                STANDARD_ASSET_HEIGHT / sampleSize);
-        options.inPreferredConfig = Bitmap.Config.RGB_565;
-        options.inDither = true;
-        Bitmap bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
-
-        if (bmp != null) {
-            LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+        else {
+            // On P, we can get a bitmap back in one step with ImageDecoder
+            try {
+                bmp = ImageDecoder.decodeBitmap(ImageDecoder.createSource(file), new ImageDecoder.OnHeaderDecodedListener() {
+                    @Override
+                    public void onHeaderDecoded(ImageDecoder imageDecoder, ImageDecoder.ImageInfo imageInfo, ImageDecoder.Source source) {
+                        imageDecoder.setTargetSize(STANDARD_ASSET_WIDTH, STANDARD_ASSET_HEIGHT);
+                        if (isLowRamDevice) {
+                            imageDecoder.setMemorySizePolicy(ImageDecoder.MEMORY_POLICY_LOW_RAM);
+                        }
+                    }
+                });
+            } catch (IOException e) {
+                e.printStackTrace();
+                return null;
+            }
         }
 
         return bmp;

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

@@ -24,6 +24,7 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.KeyEvent;
+import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
@@ -196,12 +197,7 @@ public class AddComputerManually extends Activity {
                         (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());
+                    return handleDoneEvent();
                 }
                 else if (actionId == EditorInfo.IME_ACTION_PREVIOUS) {
                     // This is how the Fire TV dismisses the keyboard
@@ -214,8 +210,28 @@ public class AddComputerManually extends Activity {
             }
         });
 
+        findViewById(R.id.addPcButton).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                handleDoneEvent();
+            }
+        });
+
         // Bind to the ComputerManager service
         bindService(new Intent(AddComputerManually.this,
                     ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
     }
+
+    // Returns true if the event should be eaten
+    private boolean handleDoneEvent() {
+        String hostAddress = hostText.getText().toString().trim();
+
+        if (hostAddress.length() == 0) {
+            Toast.makeText(AddComputerManually.this, getResources().getString(R.string.addpc_enter_ip), Toast.LENGTH_LONG).show();
+            return true;
+        }
+
+        computersToAdd.add(hostAddress);
+        return false;
+    }
 }

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

@@ -24,7 +24,6 @@ public class PreferenceConfiguration {
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
     private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
     private static final String ONLY_L3_R3_PREF_STRING = "checkbox_only_show_L3R3";
-    private static final String BATTERY_SAVER_PREF_STRING = "checkbox_battery_saver";
     private static final String DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
     private static final String ENABLE_HDR_PREF_STRING = "checkbox_enable_hdr";
     private static final String ENABLE_PIP_PREF_STRING = "checkbox_enable_pip";
@@ -75,7 +74,6 @@ public class PreferenceConfiguration {
     public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
     public boolean onscreenController;
     public boolean onlyL3R3;
-    public boolean batterySaver;
     public boolean disableFrameDrop;
     public boolean enableHdr;
     public boolean enablePip;
@@ -244,7 +242,6 @@ public class PreferenceConfiguration {
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
         config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
         config.onlyL3R3 = prefs.getBoolean(ONLY_L3_R3_PREF_STRING, ONLY_L3_R3_DEFAULT);
-        config.batterySaver = prefs.getBoolean(BATTERY_SAVER_PREF_STRING, DEFAULT_BATTERY_SAVER);
         config.disableFrameDrop = prefs.getBoolean(DISABLE_FRAME_DROP_PREF_STRING, DEFAULT_DISABLE_FRAME_DROP);
         config.enableHdr = prefs.getBoolean(ENABLE_HDR_PREF_STRING, DEFAULT_ENABLE_HDR);
         config.enablePip = prefs.getBoolean(ENABLE_PIP_PREF_STRING, DEFAULT_ENABLE_PIP);

app/src/main/java/com/limelight/ui/StreamView.java

@@ -3,15 +3,21 @@ package com.limelight.ui;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.KeyEvent;
 import android.view.SurfaceView;
 
 public class StreamView extends SurfaceView {
     private double desiredAspectRatio;
+    private InputCallbacks inputCallbacks;
 
     public void setDesiredAspectRatio(double aspectRatio) {
         this.desiredAspectRatio = aspectRatio;
     }
 
+    public void setInputCallbacks(InputCallbacks callbacks) {
+        this.inputCallbacks = callbacks;
+    }
+
     public StreamView(Context context) {
         super(context);
     }
@@ -52,4 +58,30 @@ public class StreamView extends SurfaceView {
 
         setMeasuredDimension(measuredWidth, measuredHeight);
     }
+
+    @Override
+    public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+        // This callbacks allows us to override dumb IME behavior like when
+        // Samsung's default keyboard consumes Shift+Space. We'll process
+        // the input event directly if any modifier keys are down.
+        if (inputCallbacks != null && event.getModifiers() != 0) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (inputCallbacks.handleKeyDown(event)) {
+                    return true;
+                }
+            }
+            else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (inputCallbacks.handleKeyUp(event)) {
+                    return true;
+                }
+            }
+        }
+
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    public interface InputCallbacks {
+        boolean handleKeyUp(KeyEvent event);
+        boolean handleKeyDown(KeyEvent event);
+    }
 }

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

@@ -7,7 +7,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.limelight.R;
 import com.limelight.preferences.PreferenceConfiguration;
@@ -57,6 +59,16 @@ public class UiHelper {
             rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
                     horizontalPaddingPixels, verticalPaddingPixels);
         }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            // Allow this non-streaming activity to layout under notches.
+            //
+            // We should NOT do this for the Game activity unless
+            // the user specifically opts in, because it can obscure
+            // parts of the streaming surface.
+            activity.getWindow().getAttributes().layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
     }
 
     public static void showDecoderCrashDialog(Activity activity) {

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

@@ -22,11 +22,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/manuallyAddPcText"
+        android:layout_toLeftOf="@+id/addPcButton"
+        android:layout_toStartOf="@+id/addPcButton"
         android:layout_marginTop="25dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
         android:ems="10"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
@@ -34,5 +34,15 @@
         
         <requestFocus />
     </EditText>
+
+    <Button
+        android:id="@+id/addPcButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="25dp"
+        android:layout_below="@+id/manuallyAddPcText"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:text="@android:string/ok"/>
 	
 </RelativeLayout>

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

@@ -1,3 +1,4 @@
+<!-- Portrait orientation only -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"

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

@@ -110,8 +110,6 @@
     <string name="title_checkbox_stretch_video">Forza video a schermo intero</string>
     <string name="title_checkbox_disable_warnings">Disabilita messaggi di warning</string>
     <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
-    <string name="title_checkbox_battery_saver">Risparmio batteria</string>
-    <string name="summary_checkbox_battery_saver">Usa meno batteria, ma può aumentare lo stuttering</string>
     <string name="title_checkbox_enable_pip">Abilita modalità spettatore Picture-in-Picture</string>
     <string name="summary_checkbox_enable_pip">Permette di osservare (ma non di controllare) la stream in multitasking</string>
 

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

@@ -142,8 +142,6 @@
     <string name="message_decoding_reset">Видео декодер Вашего устройства давал сбои с выбранными настройками. Настройки трансляции были сброшены до значений по умолчанию.</string>
     <string name="error_usb_prohibited">USB доступ запрещен администратором устройства. Проверьте настройки Knox или MDM.</string>
     <string name="addpc_wrong_sitelocal">Адрес указан неверно. Вы должны ввести публичный IP-адрес Вашего роутера для передачи через интернет.</string>
-    <string name="title_checkbox_battery_saver">Экономия батареи</string>
-    <string name="summary_checkbox_battery_saver">Использует меньше заряда батареи, но может увеличить зависания</string>
     <string name="title_checkbox_enable_pip">Включить просмотр в режиме \"Картинка в картинке\"</string>
     <string name="summary_checkbox_enable_pip">Позволяет просматривать трансляцию (но не управлять ей) во время работы в других приложениях</string>
     <string name="title_checkbox_usb_bind_all">Переопределить поддержку контроллеров Android</string>

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

@@ -51,7 +51,7 @@
 	    Using remote desktop software can also cause this error. Try rebooting your machine or reinstalling GFE.
     </string>
     <string name="title_decoding_error">Video Decoder Crashed</string>
-    <string name="message_decoding_error">Moonlight has crashed due to a problem with this device\'s video decoder. Try adjusting the streaming settings if the crashes continue.</string>
+    <string name="message_decoding_error">Moonlight has crashed due to an incompatibility with this device\'s video decoder. Ensure GeForce Experience is updated to the latest version on your PC. Try adjusting the streaming settings if the crashes continue.</string>
     <string name="title_decoding_reset">Video Settings Reset</string>
     <string name="message_decoding_reset">Your device\'s video decoder continues to crash at your selected streaming settings. Your streaming settings have been reset to default.</string>
     <string name="error_usb_prohibited">USB access is prohibited by your device administrator. Check your Knox or MDM settings.</string>
@@ -113,8 +113,6 @@
     <string name="title_checkbox_stretch_video">Stretch video to full-screen</string>
     <string name="title_checkbox_disable_warnings">Disable warning messages</string>
     <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
-    <string name="title_checkbox_battery_saver">Battery saver</string>
-    <string name="summary_checkbox_battery_saver">Uses less battery, but may increase stuttering</string>
     <string name="title_checkbox_enable_pip">Enable Picture-in-Picture observer mode</string>
     <string name="summary_checkbox_enable_pip">Allows the stream to be viewed (but not controlled) while multitasking</string>
 
@@ -124,7 +122,7 @@
 
     <string name="category_gamepad_settings">Gamepad Settings</string>
     <string name="title_checkbox_multi_controller">Multiple controller support</string>
-    <string name="summary_checkbox_multi_controller">When unchecked, all controllers appear as one</string>
+    <string name="summary_checkbox_multi_controller">Uncheck for games with controller detection issues</string>
     <string name="title_seekbar_deadzone">Adjust analog stick deadzone</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One controller driver</string>

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

@@ -24,11 +24,6 @@
             android:key="checkbox_stretch_video"
             android:title="@string/title_checkbox_stretch_video"
             android:defaultValue="false" />
-        <CheckBoxPreference
-            android:key="checkbox_battery_saver"
-            android:title="@string/title_checkbox_battery_saver"
-            android:summary="@string/summary_checkbox_battery_saver"
-            android:defaultValue="false" />
         <CheckBoxPreference
             android:key="checkbox_enable_pip"
             android:title="@string/title_checkbox_enable_pip"

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha17'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 03 12:51:12 PDT 2017
+#Tue May 08 18:56:31 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

moonlight-android.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="moonlight-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>