From 04713c007b691cfa32dcf5a1a4a482bd08bcf9e3 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 30 Jan 2016 05:10:47 -0500
Subject: [PATCH] Remove some hacks for Android TV

---
 app/src/main/AndroidManifest.xml              | 17 +++--------------
 app/src/main/java/com/limelight/PcViewTv.java |  6 ------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/java/com/limelight/PcViewTv.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 35389d1b..2352c3bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,17 +12,18 @@
     <uses-feature android:name="android.hardware.wifi" android:required="false" />
     <uses-feature android:name="android.hardware.gamepad" android:required="false" />
     <uses-feature android:name="android.hardware.usb.host" android:required="false" />
+    <uses-feature android:name="android.software.leanback" android:required="false" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
+        android:banner="@drawable/atv_banner"
         android:theme="@style/AppTheme" >
 
         <!-- Samsung multi-window support -->
         <uses-library android:name="com.sec.android.app.multiwindow" android:required="false" />
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
         
-        <!-- Launcher for traditional devices -->
         <activity
             android:name=".PcView"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
@@ -30,22 +31,10 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="tv.ouya.intent.category.APP" />
             </intent-filter>
         </activity>
-        
-        <!-- Launcher for Android TV devices -->
-        <activity
-            android:name=".PcViewTv"
-            android:logo="@drawable/atv_banner"
-            android:icon="@drawable/atv_banner"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-        
         <activity
             android:name=".AppView"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
diff --git a/app/src/main/java/com/limelight/PcViewTv.java b/app/src/main/java/com/limelight/PcViewTv.java
deleted file mode 100644
index 9a2bb898..00000000
--- a/app/src/main/java/com/limelight/PcViewTv.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.limelight;
-
-/* This is a dummy class to allow for a separate icon
- * and launcher for TV.
- */
-public class PcViewTv extends PcView {}