Merge https://github.com/limelight-stream/limelight-android

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

@@ -1,6 +1,5 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/frameLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Game" >
@@ -11,4 +10,4 @@
         android:layout_height="match_parent"
         android:layout_gravity="center" />
 
-</FrameLayout>
+</merge>

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

@@ -9,5 +9,7 @@
         android:numColumns="auto_fit"
         android:columnWidth="160dp"
         android:stretchMode="spacingWidth"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -9,5 +9,7 @@
         android:numColumns="auto_fit"
         android:columnWidth="105dp"
         android:stretchMode="spacingWidth"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -6,10 +6,12 @@
     <ListView
         android:id="@+id/fragmentView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="@drawable/list_view_unselected"
         android:fastScrollEnabled="true"
         android:longClickable="false"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:stackFromBottom="false" >
 
     </ListView>

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

@@ -8,5 +8,7 @@
         android:layout_height="fill_parent"
         android:numColumns="auto_fit"
         android:columnWidth="160dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -8,5 +8,7 @@
         android:layout_height="fill_parent"
         android:numColumns="auto_fit"
         android:columnWidth="105dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -5,6 +5,8 @@
         <item>720p - 60 FPS</item>
         <item>1080p - 30 FPS</item>
         <item>1080p - 60 FPS</item>
+        <item>4K - 30 FPS</item>
+        <item>4K - 60 FPS</item>
     </string-array>
 
     <string-array name="decoder_names">

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

@@ -95,14 +95,14 @@
     <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
 
     <string name="category_gamepad_settings">Impostazioni Gamepad</string>
-    <string name="title_checkbox_multi_controller">Enable multiple controller support</string>
-    <string name="summary_checkbox_multi_controller">When unchecked, all controllers appear as one</string>
+    <string name="title_checkbox_multi_controller">Supporto controller multipli</string>
+    <string name="summary_checkbox_multi_controller">Quando disabilitato, tutti i controllers appaiono come uno solo</string>
     <string name="title_seekbar_deadzone">Aggiusta deadzone degli stick analogici</string>
     <string name="suffix_seekbar_deadzone">%</string>
 
     <string name="category_ui_settings">Impostazioni Interfaccia</string>
     <string name="title_language_list">Lingua</string>
-    <string name="summary_language_list">Lingua da usare in Limelight</string>
+    <string name="summary_language_list">Lingua da usare in Moonlight</string>
     <string name="title_checkbox_list_mode">Usa lista invece della griglia</string>
     <string name="summary_checkbox_list_mode">Visualizza applicazioni e computers in una lista invece di una griglia</string>
     <string name="title_checkbox_small_icon_mode">Usa icone piccole</string>
@@ -115,6 +115,4 @@
     <string name="summary_checkbox_host_audio">Riproduci l\'audio sul computer e su questo dispositivo</string>
 
     <string name="category_advanced_settings">Impostazioni Avanzate</string>
-    <string name="title_decoder_list">Cambia decoder</string>
-    <string name="summary_decoder_list">Il decoder software può ridurre la latenza video quando si usano impostazioni streaming basse</string>
 </resources>

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

@@ -5,12 +5,16 @@
         <item>720p 60 FPS</item>
         <item>1080p 30 FPS</item>
         <item>1080p 60 FPS</item>
+        <item>4K 30 FPS</item>
+        <item>4K 60 FPS</item>
     </string-array>
     <string-array name="resolution_values" translatable="false">
         <item>720p30</item>
         <item>720p60</item>
         <item>1080p30</item>
         <item>1080p60</item>
+        <item>4K30</item>
+        <item>4K60</item>
     </string-array>
 
     <string-array name="language_names" translatable="false">
@@ -34,4 +38,15 @@
         <item>software</item>
         <item>hardware</item>
     </string-array>
+
+    <string-array name="video_format_names">
+        <item>Use H.265 only if safe</item>
+        <item>Always use H.265 if available</item>
+        <item>Never use H.265</item>
+    </string-array>
+    <string-array name="video_format_values" translatable="false">
+        <item>auto</item>
+        <item>forceh265</item>
+        <item>neverh265</item>
+    </string-array>
 </resources>

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

@@ -44,9 +44,9 @@
     <string name="conn_establishing_title">Establishing Connection</string>
     <string name="conn_establishing_msg">Starting connection</string>
     <string name="conn_metered">Warning: Your active network connection is metered!</string>
-    <string name="conn_client_latency">Average client-side frame latency:</string>
+    <string name="conn_client_latency">Average frame decoding latency:</string>
     <string name="conn_client_latency_hw">hardware decoder latency:</string>
-    <string name="conn_hardware_latency">Average hardware decoder latency:</string>
+    <string name="conn_hardware_latency">Average hardware decoding latency:</string>
     <string name="conn_starting">Starting</string>
     <string name="conn_error_title">Connection Error</string>
     <string name="conn_error_msg">Failed to start</string>
@@ -94,15 +94,21 @@
     <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="category_audio_settings">Audio Settings</string>
+    <string name="title_checkbox_51_surround">Enable 5.1 surround sound</string>
+    <string name="summary_checkbox_51_surround">Uncheck if you experience audio issues. Requires GFE 2.7 or higher.</string>
+
     <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="title_seekbar_deadzone">Adjust analog stick deadzone</string>
     <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Xbox One controller driver</string>
+    <string name="summary_checkbox_xb1_driver">Enables a built-in USB driver for devices without native Xbox One controller support.</string>
 
     <string name="category_ui_settings">UI Settings</string>
     <string name="title_language_list">Language</string>
-    <string name="summary_language_list">Language to use for Limelight</string>
+    <string name="summary_language_list">Language to use for Moonlight</string>
     <string name="title_checkbox_list_mode">Use lists instead of grids</string>
     <string name="summary_checkbox_list_mode">Display apps and PCs in lists instead of grids</string>
     <string name="title_checkbox_small_icon_mode">Use small icons</string>
@@ -115,6 +121,7 @@
     <string name="summary_checkbox_host_audio">Play audio from the computer and this device</string>
 
     <string name="category_advanced_settings">Advanced Settings</string>
-    <string name="title_decoder_list">Change decoder</string>
-    <string name="summary_decoder_list">Software decoding may improve video latency at lower streaming settings</string>
+    <string name="title_video_format">Change H.265 settings</string>
+    <string name="summary_video_format">H.265 lowers video bandwidth requirements but requires a very recent device.</string>
+
 </resources>

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

@@ -26,6 +26,13 @@
             android:summary="@string/summary_checkbox_disable_warnings"
             android:defaultValue="false" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/category_audio_settings">
+        <CheckBoxPreference
+            android:key="checkbox_51_surround"
+            android:title="@string/title_checkbox_51_surround"
+            android:summary="@string/summary_checkbox_51_surround"
+            android:defaultValue="false" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_gamepad_settings">
         <!--com.limelight.preferences.SeekBarPreference
             android:key="seekbar_deadzone"
@@ -38,6 +45,11 @@
             android:title="@string/title_checkbox_multi_controller"
             android:summary="@string/summary_checkbox_multi_controller"
             android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="checkbox_usb_driver"
+            android:title="@string/title_checkbox_xb1_driver"
+            android:summary="@string/summary_checkbox_xb1_driver"
+            android:defaultValue="true" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings">
         <CheckBoxPreference
@@ -71,11 +83,11 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_advanced_settings">
         <ListPreference
-            android:key="list_decoders"
-            android:title="@string/title_decoder_list"
-            android:entries="@array/decoder_names"
-            android:entryValues="@array/decoder_values"
-            android:summary="@string/summary_decoder_list"
+            android:key="video_format"
+            android:title="@string/title_video_format"
+            android:entries="@array/video_format_names"
+            android:entryValues="@array/video_format_values"
+            android:summary="@string/summary_video_format"
             android:defaultValue="auto" />
     </PreferenceCategory>
     <PreferenceCategory android:title="Virtual Controller">