Update common

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

@@ -15,6 +15,7 @@ import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.R;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.SpinnerDialog;
+import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -52,6 +53,8 @@ public class AppView extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_app_view);
+
+        UiHelper.notifyNewRootView(this);
 		
 		byte[] address = getIntent().getByteArrayExtra(ADDRESS_EXTRA);
 		uniqueId = getIntent().getStringExtra(UNIQUEID_EXTRA);

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

@@ -517,7 +517,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 					// ACTION_MOVE is special because it always has actionIndex == 0
 					// We'll call the move handlers for all indexes manually
                     for (TouchContext aTouchContextMap : touchContextMap) {
-                        aTouchContextMap.touchMoveEvent(eventX, eventY);
+                        if (aTouchContextMap.getActionIndex() < event.getPointerCount())
+                        {
+                            aTouchContextMap.touchMoveEvent(
+                                    (int)event.getX(aTouchContextMap.getActionIndex()),
+                                    (int)event.getY(aTouchContextMap.getActionIndex()));
+                        }
                     }
 					break;
 				default:

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

@@ -17,6 +17,7 @@ import com.limelight.nvstream.wol.WakeOnLanSender;
 import com.limelight.preferences.AddComputerManually;
 import com.limelight.preferences.StreamSettings;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
 import android.app.Service;
@@ -92,6 +93,8 @@ public class PcView extends Activity {
 	private void initializeViews() {
 		setContentView(R.layout.activity_pc_view);
 
+        UiHelper.notifyNewRootView(this);
+
         // Set default preferences if we've never been run
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 

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

@@ -21,6 +21,11 @@ public class TouchContext {
 		this.conn = conn;
 		this.actionIndex = actionIndex;
 	}
+
+    public int getActionIndex()
+    {
+        return actionIndex;
+    }
 	
 	private boolean isTap()
 	{
@@ -84,10 +89,8 @@ public class TouchContext {
 			
 			lastTouchX = eventX;
 			lastTouchY = eventY;
-			
-			return true;
 		}
 		
-		return false;
+		return true;
 	}
 }

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

@@ -7,6 +7,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.R;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
 import android.app.Service;
@@ -126,8 +127,10 @@ public class AddComputerManually extends Activity {
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.activity_add_computer_manually);
-		
-		this.addPcButton = (Button) findViewById(R.id.addPc);
+
+        UiHelper.notifyNewRootView(this);
+
+        this.addPcButton = (Button) findViewById(R.id.addPc);
 		this.hostText = (TextView) findViewById(R.id.hostTextView);
 		
 		// Bind to the ComputerManager service

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

@@ -8,6 +8,7 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 
 import com.limelight.R;
+import com.limelight.utils.UiHelper;
 
 public class StreamSettings extends Activity {
     @Override
@@ -18,6 +19,8 @@ public class StreamSettings extends Activity {
         getFragmentManager().beginTransaction().replace(
                 R.id.stream_settings, new SettingsFragment()
         ).commit();
+
+        UiHelper.notifyNewRootView(this);
     }
 
     public static class SettingsFragment extends PreferenceFragment {

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

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

app/src/main/res/values-sw600dp/dimens.xml

@@ -1,8 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here.
-    -->
-
-</resources>

app/src/main/res/values-sw720dp-land/dimens.xml

@@ -1,9 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-
-</resources>

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

@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>

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

@@ -1,40 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+
     -->
     <style name="AppBaseTheme" parent="android:Theme">
         <!--
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+
         -->
     </style>
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+        <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    </style>
-
-    <style name="FullscreenTheme" parent="android:Theme.NoTitleBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="buttonBarStyle">@style/ButtonBar</item>
-        <item name="buttonBarButtonStyle">@style/ButtonBarButton</item>
-    </style>
-
-    <style name="ButtonBar">
-        <item name="android:paddingLeft">2dp</item>
-        <item name="android:paddingTop">5dp</item>
-        <item name="android:paddingRight">2dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:background">@android:drawable/bottom_bar</item>
-    </style>
-
 </resources>